diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-09 21:30:42 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-09 21:30:42 +0100 |
| commit | 5dc0fa782ad4a2cfad93c016765492083e687cf3 (patch) | |
| tree | a7c41c15779b5cbeafcfdc445f796c46d80ec0c0 /net | |
| parent | mac80211: fix the skb cloned check in the tx path (diff) | |
| parent | Bluetooth: Set conn state to BT_DISCONN to avoid multiple responses (diff) | |
| download | linux-5dc0fa782ad4a2cfad93c016765492083e687cf3.tar.xz linux-5dc0fa782ad4a2cfad93c016765492083e687cf3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/l2cap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 7550abb0c96a..675614e38e14 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -859,6 +859,7 @@ static void __l2cap_sock_close(struct sock *sk, int reason) result = L2CAP_CR_SEC_BLOCK; else result = L2CAP_CR_BAD_PSM; + sk->sk_state = BT_DISCONN; rsp.scid = cpu_to_le16(l2cap_pi(sk)->dcid); rsp.dcid = cpu_to_le16(l2cap_pi(sk)->scid); |