diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-06 10:55:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-06 10:55:42 -0800 |
| commit | 5f9251cb93237c9578160df9acc6ce9948ad8c52 (patch) | |
| tree | 5a5718b5a076ce6f04bb3d0e1691aa65d87cc8a8 /net/bluetooth/l2cap.c | |
| parent | 2c6607c611cb7bf0a6750bcea34a258144e302c5 (diff) | |
| parent | 06778b1c383afbdb88ffd837e117bec06a76f450 (diff) | |
| download | op-kernel-dev-5f9251cb93237c9578160df9acc6ce9948ad8c52.zip op-kernel-dev-5f9251cb93237c9578160df9acc6ce9948ad8c52.tar.gz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/bluetooth/l2cap.c')
| -rw-r--r-- | net/bluetooth/l2cap.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index c12eccf..c791fcd 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -3124,8 +3124,14 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr if (!sk) return -ENOENT; - if (sk->sk_state == BT_DISCONN) + if (sk->sk_state != BT_CONFIG) { + struct l2cap_cmd_rej rej; + + rej.reason = cpu_to_le16(0x0002); + l2cap_send_cmd(conn, cmd->ident, L2CAP_COMMAND_REJ, + sizeof(rej), &rej); goto unlock; + } /* Reject if config buffer is too small. */ len = cmd_len - sizeof(*req); |
