Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[sfrench/cifs-2.6.git] / net / bluetooth / bnep / core.c

diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 9ac0497decb8cdf412279a1a421eef1fb23f36a7..ef09c7b3a8585451a9a1f1ec4ec29b5650988019 100644 (file)
--- 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;