From 9228c3f357f2e18251ff8d441b1e04424fa40d7d Mon Sep 17 00:00:00 2001
From: Bao Liang <tim.bao@gmail.com>
Date: Sat, 29 Jan 2011 21:39:37 +0800
Subject: [PATCH] --- yaml --- r: 233432 b: refs/heads/master c:
 e733fb62082b3b187870dfba28d5f6730b8436c4 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/bluetooth/l2cap.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7f5ada834c2b..e5a1c51b8463 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 509e7861d8a5e26bb07b5a3a13e2b9e442283631
+refs/heads/master: e733fb62082b3b187870dfba28d5f6730b8436c4
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index 7550abb0c96a..675614e38e14 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/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);