diff options
| author | Gustavo Padovan | 2012-05-16 21:11:44 +0200 |
|---|---|---|
| committer | Gustavo Padovan | 2012-05-16 21:11:44 +0200 |
| commit | 08e6d907fe606b751adddce54ad8f51e0950bc3f (patch) | |
| tree | 1a987f519b1ea706a61cd23d7eeea038dfe81b7a /net/bluetooth/l2cap_core.c | |
| parent | Bluetooth: Initialize the transmit queue for L2CAP streaming mode (diff) | |
| parent | Bluetooth: mgmt: Fix device_connected sending order (diff) | |
| download | kernel-qcow2-linux-08e6d907fe606b751adddce54ad8f51e0950bc3f.tar.gz kernel-qcow2-linux-08e6d907fe606b751adddce54ad8f51e0950bc3f.tar.xz kernel-qcow2-linux-08e6d907fe606b751adddce54ad8f51e0950bc3f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 5 |
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; |