diff options
| author | Marcel Holtmann <linux-bt.adm@hostme.bitkeeper.com> | 2003-04-16 23:05:11 -0700 |
|---|---|---|
| committer | Marcel Holtmann <linux-bt.adm@hostme.bitkeeper.com> | 2003-04-16 23:05:11 -0700 |
| commit | b9568005500667e48a5c52e1f2ac6644f3c57f05 (patch) | |
| tree | a4a1bfcfeaa04c10fae1f301c1966ebfd70758c8 /include/net | |
| parent | b95baca05436d2f31984a5bf0a064b2b8e0cfc42 (diff) | |
| parent | cc25be8d62fbe9ee243cbcd96b9be7ffe5e9b87c (diff) | |
Merge bk://linux.bkbits.net/linux-2.5
into hostme.bitkeeper.com:/ua/repos/l/linux-bt/bt-2.5
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 10 | ||||
| -rw-r--r-- | include/net/bluetooth/rfcomm.h | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 044df634d3bd..5bf98447775c 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -262,7 +262,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *src); int hci_conn_auth(struct hci_conn *conn); int hci_conn_encrypt(struct hci_conn *conn); -static inline void hci_conn_set_timer(struct hci_conn *conn, long timeout) +static inline void hci_conn_set_timer(struct hci_conn *conn, unsigned long timeout) { mod_timer(&conn->timer, jiffies + timeout); } @@ -280,8 +280,12 @@ static inline void hci_conn_hold(struct hci_conn *conn) static inline void hci_conn_put(struct hci_conn *conn) { - if (atomic_dec_and_test(&conn->refcnt) && conn->out) - hci_conn_set_timer(conn, HCI_DISCONN_TIMEOUT); + if (atomic_dec_and_test(&conn->refcnt)) { + if (conn->type == SCO_LINK) + hci_conn_set_timer(conn, HZ / 100); + else if (conn->out) + hci_conn_set_timer(conn, HCI_DISCONN_TIMEOUT); + } } /* ----- HCI tasks ----- */ diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h index 73d85aae16f9..3393e95c7e0f 100644 --- a/include/net/bluetooth/rfcomm.h +++ b/include/net/bluetooth/rfcomm.h @@ -146,6 +146,11 @@ struct rfcomm_rpn { u16 param_mask; } __attribute__ ((packed)); +struct rfcomm_rls { + u8 dlci; + u8 status; +} __attribute__ ((packed)); + struct rfcomm_msc { u8 dlci; u8 v24_sig; |