diff options
| author |  David S. Miller <davem@davemloft.net>
| 2011-11-09 16:22:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2011-11-09 16:22:15 -0500 |
| commit | 3b971a7ceb2e39e0cab95c079c738b2052b3e02f (patch) | |
| tree | 511e1112b22220c0f866718bbfa8cbee386f9d27 /include/net/bluetooth/l2cap.h | |
| parent | ipv4: fix for ip_options_rcv_srr() daddr update. (diff) | |
| parent | Merge branch 'master' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/linvill... (diff) | |
| download | linux-3b971a7ceb2e39e0cab95c079c738b2052b3e02f.tar.gz linux-3b971a7ceb2e39e0cab95c079c738b2052b3e02f.tar.bz2 linux-3b971a7ceb2e39e0cab95c079c738b2052b3e02f.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'include/net/bluetooth/l2cap.h')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 7 |
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 { |