Bluetooth: Move canceling security_timer into smp_chan_destroy()
authorJohan Hedberg <johan.hedberg@intel.com>
Mon, 11 Aug 2014 19:06:42 +0000 (22:06 +0300)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 14 Aug 2014 06:49:24 +0000 (08:49 +0200)
commit109ec2309eb996fbe03302fbd40dec9014c6f849
tree962bea2291441b713848b19743c4b9528ccbd141
parent276d807317dead63ef2f13aa46e3c17d57ba0713
Bluetooth: Move canceling security_timer into smp_chan_destroy()

All places needing to cancel the security timer also call
smp_chan_destroy() in the same go. To eliminate the need to do these two
calls in multiple places simply move the timer cancellation into
smp_chan_destroy().

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/smp.c