]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9b2be13) | patch
Bluetooth: Don't take any action in smp_resume_cb if not encrypted
authorJohan Hedberg <johan.hedberg@intel.com>
Fri, 5 Sep 2014 19:19:49 +0000 (22:19 +0300)
committerMarcel Holtmann <marcel@holtmann.org>
Mon, 8 Sep 2014 17:07:55 +0000 (19:07 +0200)
commite9673f81e8eea82c3086a7a89c1b9c0d76ac46b1
tree14d8fcaad50a3e793a394a0587eacbbd3a97c6e1tree | snapshot
parent9b2be136bd3ff990b4bf677b52c068e01a06c1e9commit | diff
Bluetooth: Don't take any action in smp_resume_cb if not encrypted

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>
net/bluetooth/smp.c diff | blob | history
Linux Kernel Source Tree.