diff options
| author | Mat Martineau <mathewm@codeaurora.org> | 2011-06-03 16:21:07 -0700 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2011-07-11 11:59:17 -0700 |
| commit | 5125e9e81028c431a5f66ba0b02604a00c56750e (patch) | |
| tree | 6c5aa5dc9e7c5c382aaf0c93530d9d91f5e95298 | |
| parent | 8b00cf0995d246b2d0fa3e1f1b52b073eafec611 (diff) | |
| download | kernel_samsung_tuna-5125e9e81028c431a5f66ba0b02604a00c56750e.zip kernel_samsung_tuna-5125e9e81028c431a5f66ba0b02604a00c56750e.tar.gz kernel_samsung_tuna-5125e9e81028c431a5f66ba0b02604a00c56750e.tar.bz2 | |
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>
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 9324751..f67dc2a 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); |