summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-11-08 23:59:14 +0400
committerJohn W. Linville <linville@tuxdriver.com>2011-11-08 23:59:14 +0400
commit9270fd61a3b3efecb06d77f71efec6fb7daccb25 (patch)
treefa8c681c4599b10a4aa6ef096eb9447b46e223ec /include/net
parent24b9c373ab787ccacfa2c46736153708796f5cd6 (diff)
parentd13431ca3eb2a2c14314f04813cdc11cd869f150 (diff)
downloadlinux-9270fd61a3b3efecb06d77f71efec6fb7daccb25.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Diffstat (limited to 'include/net')
-rw-r--r--include/net/bluetooth/l2cap.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index ab90ae0970a6..6cc18f371675 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -39,8 +39,11 @@
#define L2CAP_DEFAULT_ACK_TO 200
#define L2CAP_LE_DEFAULT_MTU 23
-#define L2CAP_CONN_TIMEOUT (40000) /* 40 seconds */
-#define L2CAP_INFO_TIMEOUT (4000) /* 4 seconds */
+#define L2CAP_DISC_TIMEOUT (100)
+#define L2CAP_DISC_REJ_TIMEOUT (5000) /* 5 seconds */
+#define L2CAP_ENC_TIMEOUT (5000) /* 5 seconds */
+#define L2CAP_CONN_TIMEOUT (40000) /* 40 seconds */
+#define L2CAP_INFO_TIMEOUT (4000) /* 4 seconds */
/* L2CAP socket address */
struct sockaddr_l2 {