summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorVinicius Costa Gomes <vinicius.gomes@openbossa.org>2011-06-14 13:37:41 -0300
committerGustavo F. Padovan <padovan@profusion.mobi>2011-06-14 14:54:05 -0300
commit5d3de7df18077a0f508ae2c3e3f1866da65fdffd (patch)
tree7a52c5136964e89c80f1c26595603021ba29e2b9 /include
parent94ac02726cb87dd569bac4536f33e4b696b692eb (diff)
downloadlinux-3.10-5d3de7df18077a0f508ae2c3e3f1866da65fdffd.tar.gz
linux-3.10-5d3de7df18077a0f508ae2c3e3f1866da65fdffd.tar.bz2
linux-3.10-5d3de7df18077a0f508ae2c3e3f1866da65fdffd.zip
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')
-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 01c993b6b26..157419afe53 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;
};