diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-05-09 12:09:21 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-05-09 18:09:52 -0700 |
| commit | 3d7a9d1c7ee251a04095d43eec5a3f4ff3f710a8 (patch) | |
| tree | f3d6641ca09d1fee1cebe0b153da4a199c99e14a /net | |
| parent | 1b0336bb36f88976f1210a65b62f6a3e9578ee7b (diff) | |
| download | linux-stable-3d7a9d1c7ee251a04095d43eec5a3f4ff3f710a8.tar.gz linux-stable-3d7a9d1c7ee251a04095d43eec5a3f4ff3f710a8.tar.bz2 linux-stable-3d7a9d1c7ee251a04095d43eec5a3f4ff3f710a8.zip | |
Bluetooth: Don't trigger disconnect timeout for security mode 3 pairing
A remote device in security mode 3 that tries to connect will require
the pairing during the connection setup phase. The disconnect timeout
is now triggered within 10 milliseconds and causes the pairing to fail.
If a connection is not fully established and a PIN code request is
received, don't trigger the disconnect timeout. The either successful
or failing connection complete event will make sure that the timeout
is triggered at the right time.
The biggest problem with security mode 3 is that many Bluetooth 2.0
device and before use a temporary security mode 3 for dedicated
bonding.
Based on a report by Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Tested-by: Johan Hedberg <johan.hedberg@nokia.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 4e7cb88e5da9..184ba0a88ec0 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1493,7 +1493,7 @@ static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff hci_dev_lock(hdev); conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr); - if (conn) { + if (conn && conn->state == BT_CONNECTED) { hci_conn_hold(conn); conn->disc_timeout = HCI_PAIRING_TIMEOUT; hci_conn_put(conn); |