summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorSzymon Janc <szymon.janc@tieto.com>2012-11-20 11:38:54 +0100
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-11-20 16:03:15 -0200
commit2b2fec4d08a0aabe20d2e749cb7978f04217af65 (patch)
tree14d87c0d1ec47e417f628059720eabcaba261c6b /net/bluetooth
parentfd45bf4c923308b19d8baa3c227d26a0e7d79fa7 (diff)
downloadlinux-2b2fec4d08a0aabe20d2e749cb7978f04217af65.tar.bz2
Bluetooth: Remove OOB data if device was discovered in band
OOB authentication mechanism should be used only if pairing process has been activated by previous OOB information exchange (Core Spec 4.0 , vol. 1, Part A, 5.1.4.3). Stored OOB data for specific device should be removed if that device was discovered in band later on. Signed-off-by: Szymon Janc <szymon.janc@tieto.com> Acked-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index e3a49db9cfcb..81f4bac098c9 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -434,6 +434,8 @@ bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
BT_DBG("cache %p, %pMR", cache, &data->bdaddr);
+ hci_remove_remote_oob_data(hdev, &data->bdaddr);
+
if (ssp)
*ssp = data->ssp_mode;