aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/bluetooth
diff options
context:
space:
mode:
authorVinicius Costa Gomes <vinicius.gomes@openbossa.org>2011-06-14 13:37:41 -0300
committerJaikumar Ganesh <jaikumar@google.com>2011-07-11 11:59:23 -0700
commitb19d5cea661d5695c683bc6ba0925ce4b96dd022 (patch)
tree00fa0fca7ac02c80cdd57522ebf93c72f47b8379 /include/net/bluetooth
parent53fba6133266ef870ddb04138cdf746ea337c8b7 (diff)
downloadkernel_samsung_espresso10-b19d5cea661d5695c683bc6ba0925ce4b96dd022.zip
kernel_samsung_espresso10-b19d5cea661d5695c683bc6ba0925ce4b96dd022.tar.gz
kernel_samsung_espresso10-b19d5cea661d5695c683bc6ba0925ce4b96dd022.tar.bz2
Bluetooth: Add support for SMP timeout
This patch adds support for disconnecting the link when SMP procedure takes more than 30 seconds. SMP begins when either the Pairing Request command is sent or the Pairing Response is received, and it ends when the link is encrypted (or terminated). Vol 3, Part H Section 3.4. Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include/net/bluetooth')
-rw-r--r--include/net/bluetooth/l2cap.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 01c993b..157419a 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -401,6 +401,8 @@ struct l2cap_conn {
__u8 pcnf[16]; /* SMP Pairing Confirm */
__u8 tk[16]; /* SMP Temporary Key */
+ struct timer_list security_timer;
+
struct list_head chan_l;
rwlock_t chan_lock;
};