projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ef4177e
)
Bluetooth: Restore accidentally-deleted line
author
Mat Martineau
<
[email protected]
>
Fri, 3 Jun 2011 23:21:07 +0000
(16:21 -0700)
committer
Gustavo F. Padovan
<
[email protected]
>
Wed, 8 Jun 2011 19:58:19 +0000
(16:58 -0300)
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 <
[email protected]
>
Signed-off-by: Gustavo F. Padovan <
[email protected]
>
net/bluetooth/l2cap_core.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/l2cap_core.c
b/net/bluetooth/l2cap_core.c
index 6908a835a7a3f0110efc77e31380b376b32d4c96..e3b86fc3ba9ac66fbc9c3d5c9f6b0cf4d83541aa 100644
(file)
--- 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);