diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-11 22:36:42 -0300 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-11 22:36:42 -0300 |
| commit | cbe461c526e1e0f8b55f91180df64f02d8daed45 (patch) | |
| tree | e0d785c63d550d81cb42960ac490aebef4bc965c /net/bluetooth/l2cap_core.c | |
| parent | 1d0c4da8f717937aeda47a72bc769d80f8776795 (diff) | |
| parent | 1c2e004183178e1947882cd2e74f37826f45230e (diff) | |
| download | blackbird-op-linux-cbe461c526e1e0f8b55f91180df64f02d8daed45.tar.gz blackbird-op-linux-cbe461c526e1e0f8b55f91180df64f02d8daed45.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Conflicts:
net/bluetooth/hci_event.c
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index f9bffe3af026..4ca88247b7c2 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1314,7 +1314,12 @@ static void security_timeout(struct work_struct *work) struct l2cap_conn *conn = container_of(work, struct l2cap_conn, security_timer.work); - l2cap_conn_del(conn->hcon, ETIMEDOUT); + BT_DBG("conn %p", conn); + + if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags)) { + smp_chan_destroy(conn); + l2cap_conn_del(conn->hcon, ETIMEDOUT); + } } static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon, u8 status) |
