From: Mat Martineau <mathewm@codeaurora.org>
Date: Fri, 3 Jun 2011 23:21:07 +0000 (-0700)
Subject: Bluetooth: Restore accidentally-deleted line
X-Git-Tag: MMI-PSA29.97-13-9~18350^2~12^2~42^2~463
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d8d69c54fb8fbb7483180b609f99f2e3e539962b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Bluetooth: Restore accidentally-deleted line

When code was moved from l2cap_core.c to l2cap_sock.c in commit
6de0702b5b93da0ef097aa092b4597fbc024ebba, one line was dropped
from the old __l2cap_sock_close() implementation. This sk_state
change should still be in l2cap_chan_close().

Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 6908a835a7a3..e3b86fc3ba9a 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -435,6 +435,7 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason)
 				result = L2CAP_CR_SEC_BLOCK;
 			else
 				result = L2CAP_CR_BAD_PSM;
+			sk->sk_state = BT_DISCONN;
 
 			rsp.scid   = cpu_to_le16(chan->dcid);
 			rsp.dcid   = cpu_to_le16(chan->scid);