summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@nokia.com>2009-09-03 12:34:19 +0300
committerMarcel Holtmann <marcel@holtmann.org>2009-11-16 01:30:28 +0100
commit93f19c9fc8c98bb6d2e9825115989603ffd5cd1f (patch)
tree5635759dd469fffb423b3cb7ddaa13adfbfbff24 /net
parentd01032e4fd33110f9f3a085a36cb819c1dfc5827 (diff)
downloadop-kernel-dev-93f19c9fc8c98bb6d2e9825115989603ffd5cd1f.zip
op-kernel-dev-93f19c9fc8c98bb6d2e9825115989603ffd5cd1f.tar.gz
Bluetooth: Set general bonding security for ACL by default
This patch fixes double pairing issues with Secure Simple Paring support. It was observed that when pairing with SSP enabled, that the confirmation will be asked twice. http://www.spinics.net/lists/linux-bluetooth/msg02473.html This also causes bug when initiating SSP connection from Windows Vista. The reason is because bluetoothd does not store link keys since HCIGETAUTHINFO returns 0. Setting default to general bonding fixes these issues. Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@nokia.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_conn.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index a975098..b7c4224 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -211,6 +211,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
conn->type = type;
conn->mode = HCI_CM_ACTIVE;
conn->state = BT_OPEN;
+ conn->auth_type = HCI_AT_GENERAL_BONDING;
conn->power_save = 1;
conn->disc_timeout = HCI_DISCONN_TIMEOUT;
OpenPOWER on IntegriCloud