summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-07-20 17:10:45 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-07-20 16:15:38 +0200
commitd1d588c181e35d98113f91c8004f77cdac2bf9d5 (patch)
tree509368349bd94f74e7d3ddc58f10803a6d558374 /net
parent27b869f59d5d989df681291a8449c03777aa8ca6 (diff)
downloadlinux-stable-d1d588c181e35d98113f91c8004f77cdac2bf9d5.tar.gz
linux-stable-d1d588c181e35d98113f91c8004f77cdac2bf9d5.tar.bz2
linux-stable-d1d588c181e35d98113f91c8004f77cdac2bf9d5.zip
Bluetooth: Disable HCI_CONNECTABLE based passive scanning for now
When HCI_CONNECTABLE is set the code has been enabling passive scanning in order to be consistent with BR/EDR and accept connections from any device doing directed advertising to us. However, some hardware (particularly CSR) can get very noisy even when doing duplicates filtering, making this feature waste resources. Considering that the feature is for fairly corner-case use (devices who'd use directed advertising would likely be in the whitelist anyway) it's better to disable it for now. It may still be brought back later, possibly with a better implementation (e.g. through improved scan parameters). Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index f575abdf2b4e..f82a6cf1aaa8 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -5465,8 +5465,7 @@ void hci_update_background_scan(struct hci_dev *hdev)
hci_req_init(&req, hdev);
- if (!test_bit(HCI_CONNECTABLE, &hdev->dev_flags) &&
- list_empty(&hdev->pend_le_conns) &&
+ if (list_empty(&hdev->pend_le_conns) &&
list_empty(&hdev->pend_le_reports)) {
/* If there is no pending LE connections or devices
* to be scanned for, we should stop the background