leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Don't take any action in smp_resume_cb if not encrypted

Browse Source 
When smp_resume_cb is called if we're not encrypted (i.e. the callback
wasn't called because the connection became encrypted) we shouldn't take
any action at all. This patch moves also the security_timer cancellation
behind this condition.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2014-09-05 22:19:49 +03:00 committed by Marcel Holtmann
parent 1b0921d6be
commit 84bc0db53b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/bluetooth/smp.c
View File

@ -1533,10 +1533,12 @@ static void smp_resume_cb(struct l2cap_chan *chan)
if (!smp)
return;
if (!test_bit(HCI_CONN_ENCRYPT, &hcon->flags))
return;
cancel_delayed_work(&smp->security_timer);
if (test_bit(HCI_CONN_ENCRYPT, &hcon->flags))
queue_work(hdev->workqueue, &smp->distribute_work);
queue_work(hdev->workqueue, &smp->distribute_work);
}
static void smp_ready_cb(struct l2cap_chan *chan)