summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2006-09-28 15:29:09 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 18:03:11 -0700
commit37e97b4ef0d18b77a45a4714154daf3499206654 (patch)
treea4a245c811525bbe7bf728558a6415b50bf1ea3c /net/bluetooth
parent75f3123c118743f52b690d9ab41649814befda0a (diff)
downloadlinux-3.10-37e97b4ef0d18b77a45a4714154daf3499206654.tar.gz
linux-3.10-37e97b4ef0d18b77a45a4714154daf3499206654.tar.bz2
linux-3.10-37e97b4ef0d18b77a45a4714154daf3499206654.zip
[Bluetooth]: Don't update disconnect timer for incoming connections
In the case of device pairing the only safe method is to establish a low-level ACL link. In this case, the remote side should not use the disconnect timer to give the other side the chance to enter the PIN code. If the disconnect timer is used, the connection will be dropped to soon, because it is impossible to identify an actual user of this link. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_event.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index bb25484b874..d43d0c89097 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -750,8 +750,6 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s
if (test_bit(HCI_ENCRYPT, &hdev->flags))
conn->link_mode |= HCI_LM_ENCRYPT;
- hci_conn_hold(conn);
-
/* Get remote features */
if (conn->type == ACL_LINK) {
struct hci_cp_read_remote_features cp;
@@ -779,9 +777,11 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s
hci_send_cmd(hdev, OGF_LINK_CTL,
OCF_CHANGE_CONN_PTYPE, sizeof(cp), &cp);
+ } else {
+ /* Update disconnect timer */
+ hci_conn_hold(conn);
+ hci_conn_put(conn);
}
-
- hci_conn_put(conn);
} else
conn->state = BT_CLOSED;