diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-03 13:51:02 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-03 13:51:02 -0800 |
| commit | a7fca0ccecd3f5a111e08df8439f0b884099ad59 (patch) | |
| tree | 44b360a8f367e2414daf3ad92622ab2544ac0fbd /net/bluetooth/bnep/core.c | |
| parent | 424eff975192553a9ea8bfd51bf65039ffb356ef (diff) | |
| parent | 2861453b1b5e022fd5e1294b8fbf39254440b661 (diff) | |
| download | op-kernel-dev-a7fca0ccecd3f5a111e08df8439f0b884099ad59.zip op-kernel-dev-a7fca0ccecd3f5a111e08df8439f0b884099ad59.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/bnep/core.c')
| -rw-r--r-- | net/bluetooth/bnep/core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index cafe9f5..29b1b22 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c @@ -230,7 +230,6 @@ static int bnep_rx_control(struct bnep_session *s, void *data, int len) switch (cmd) { case BNEP_CMD_NOT_UNDERSTOOD: - case BNEP_SETUP_CONN_REQ: case BNEP_SETUP_CONN_RSP: case BNEP_FILTER_NET_TYPE_RSP: case BNEP_FILTER_MULTI_ADDR_RSP: @@ -245,6 +244,10 @@ static int bnep_rx_control(struct bnep_session *s, void *data, int len) err = bnep_ctrl_set_mcfilter(s, data, len); break; + case BNEP_SETUP_CONN_REQ: + err = bnep_send_rsp(s, BNEP_SETUP_CONN_RSP, BNEP_CONN_NOT_ALLOWED); + break; + default: { u8 pkt[3]; pkt[0] = BNEP_CONTROL; |
