diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-29 01:40:49 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-29 01:40:49 -0400 |
| commit | bf0de3e9c87fda3d1fc55ac2914948f3ca32ff9b (patch) | |
| tree | 289f4ea835c270de9af81d75d6caae1d1bc00f75 /include/net/bluetooth/hci.h | |
| parent | 942e4a2bd680c606af0211e64eb216be2e19bf61 (diff) | |
| parent | 3fdca1e1370ffe89980927cdef0583bebcd8caaf (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'include/net/bluetooth/hci.h')
| -rw-r--r-- | include/net/bluetooth/hci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index f69f015bbcc0..ed3aea1605e8 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
| @@ -101,6 +101,7 @@ enum { | |||
| 101 | /* HCI timeouts */ | 101 | /* HCI timeouts */ |
| 102 | #define HCI_CONNECT_TIMEOUT (40000) /* 40 seconds */ | 102 | #define HCI_CONNECT_TIMEOUT (40000) /* 40 seconds */ |
| 103 | #define HCI_DISCONN_TIMEOUT (2000) /* 2 seconds */ | 103 | #define HCI_DISCONN_TIMEOUT (2000) /* 2 seconds */ |
| 104 | #define HCI_PAIRING_TIMEOUT (60000) /* 60 seconds */ | ||
| 104 | #define HCI_IDLE_TIMEOUT (6000) /* 6 seconds */ | 105 | #define HCI_IDLE_TIMEOUT (6000) /* 6 seconds */ |
| 105 | #define HCI_INIT_TIMEOUT (10000) /* 10 seconds */ | 106 | #define HCI_INIT_TIMEOUT (10000) /* 10 seconds */ |
| 106 | 107 | ||