diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-28 22:40:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-28 22:40:49 -0700 |
| commit | bf0de3e9c87fda3d1fc55ac2914948f3ca32ff9b (patch) | |
| tree | 289f4ea835c270de9af81d75d6caae1d1bc00f75 /include | |
| parent | 942e4a2bd680c606af0211e64eb216be2e19bf61 (diff) | |
| parent | 3fdca1e1370ffe89980927cdef0583bebcd8caaf (diff) | |
| download | linux-bf0de3e9c87fda3d1fc55ac2914948f3ca32ff9b.tar.gz linux-bf0de3e9c87fda3d1fc55ac2914948f3ca32ff9b.tar.bz2 linux-bf0de3e9c87fda3d1fc55ac2914948f3ca32ff9b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/hci.h | 1 | ||||
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 8 |
2 files changed, 6 insertions, 3 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 { /* HCI timeouts */ #define HCI_CONNECT_TIMEOUT (40000) /* 40 seconds */ #define HCI_DISCONN_TIMEOUT (2000) /* 2 seconds */ +#define HCI_PAIRING_TIMEOUT (60000) /* 60 seconds */ #define HCI_IDLE_TIMEOUT (6000) /* 6 seconds */ #define HCI_INIT_TIMEOUT (10000) /* 10 seconds */ diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 01f9316b4c23..be5bd713d2c9 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -171,6 +171,7 @@ struct hci_conn { __u8 auth_type; __u8 sec_level; __u8 power_save; + __u16 disc_timeout; unsigned long pend; unsigned int sent; @@ -180,7 +181,8 @@ struct hci_conn { struct timer_list disc_timer; struct timer_list idle_timer; - struct work_struct work; + struct work_struct work_add; + struct work_struct work_del; struct device dev; @@ -348,9 +350,9 @@ static inline void hci_conn_put(struct hci_conn *conn) if (conn->type == ACL_LINK) { del_timer(&conn->idle_timer); if (conn->state == BT_CONNECTED) { - timeo = msecs_to_jiffies(HCI_DISCONN_TIMEOUT); + timeo = msecs_to_jiffies(conn->disc_timeout); if (!conn->out) - timeo *= 5; + timeo *= 2; } else timeo = msecs_to_jiffies(10); } else |