From: Mat Martineau Date: Fri, 3 Jun 2011 23:21:07 +0000 (-0700) Subject: Bluetooth: Restore accidentally-deleted line X-Git-Tag: firefly_0821_release~7613^2~516 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5125e9e81028c431a5f66ba0b02604a00c56750e;p=firefly-linux-kernel-4.4.55.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 Signed-off-by: Gustavo F. Padovan --- diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 9324751f5c26..f67dc2a6a578 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);