commit 6c9d42a1615c6dc19c4a57a77d9c4b3d779bb741
author Gustavo F. Padovan <padovan@profusion.mobi> Tue Dec 20 10:57:27 2011 -0200
committer Gustavo F. Padovan <padovan@profusion.mobi> Tue Dec 20 17:07:03 2011 -0200
tree 27c2c72dd631c05de40684535d2028441e2d792e
parent c2ec9c1bbd17cdd1fc962f000b4ecb98c1dad830

Bluetooth: convert security timer to delayed_work

This one also needs to run in process context

Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

include/net/bluetooth/l2cap.h

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index e199c2f..fc481d1 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -532,7 +532,7 @@
 
 	__u8		disc_reason;
 
-	struct timer_list security_timer;
+	struct delayed_work  security_timer;
 	struct smp_chan *smp_chan;
 
 	struct list_head chan_l;