Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

1 files changed, 5 insertions, 0 deletions

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 7adfcecf7a5e..3714c9656459 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4916,6 +4916,11 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
 
                 if (!status && (chan->state == BT_CONNECTED ||
                                                 chan->state == BT_CONFIG)) {
+                        struct sock *sk = chan->sk;
+
+                        bt_sk(sk)->suspended = false;
+                        sk->sk_state_change(sk);
+
                         l2cap_check_encryption(chan, encrypt);
                         l2cap_chan_unlock(chan);
                         continue;