aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-02-09 15:30:42 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-02-09 15:30:42 -0500
commit5dc0fa782ad4a2cfad93c016765492083e687cf3 (patch)
treea7c41c15779b5cbeafcfdc445f796c46d80ec0c0 /net
parentfc7c976dc7a565213393ce700d4a6105f037bf20 (diff)
parente733fb62082b3b187870dfba28d5f6730b8436c4 (diff)
downloadkernel_samsung_smdk4412-5dc0fa782ad4a2cfad93c016765492083e687cf3.tar.gz
kernel_samsung_smdk4412-5dc0fa782ad4a2cfad93c016765492083e687cf3.tar.bz2
kernel_samsung_smdk4412-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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 7550abb0c96..675614e38e1 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);