diff options
author | Andre Guedes <andre.guedes@openbossa.org> | 2012-04-24 20:02:56 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo@padovan.org> | 2012-05-09 00:40:46 -0400 |
commit | 479453d5fe3a5b911b7f56474764988100f9f650 (patch) | |
tree | 57f5845327b933cef0916d0949947b8d296ed5f7 /net/bluetooth/hci_event.c | |
parent | 8e9f98921c0718cda76bc53c2b51954657b60fa6 (diff) |
Bluetooth: Remove advertising cache
User-space pass the remote device address type to kernel through
struct sockaddr_l2 what makes the advertising useless. This patch
removes all advertising cache code.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r-- | net/bluetooth/hci_event.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 054b1ad74496..ae0a57d21ec4 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -1100,10 +1100,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, | |||
1100 | 1100 | ||
1101 | set_bit(HCI_LE_SCAN, &hdev->dev_flags); | 1101 | set_bit(HCI_LE_SCAN, &hdev->dev_flags); |
1102 | 1102 | ||
1103 | cancel_delayed_work_sync(&hdev->adv_work); | ||
1104 | |||
1105 | hci_dev_lock(hdev); | 1103 | hci_dev_lock(hdev); |
1106 | hci_adv_entries_clear(hdev); | ||
1107 | hci_discovery_set_state(hdev, DISCOVERY_FINDING); | 1104 | hci_discovery_set_state(hdev, DISCOVERY_FINDING); |
1108 | hci_dev_unlock(hdev); | 1105 | hci_dev_unlock(hdev); |
1109 | break; | 1106 | break; |
@@ -1118,8 +1115,6 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, | |||
1118 | 1115 | ||
1119 | clear_bit(HCI_LE_SCAN, &hdev->dev_flags); | 1116 | clear_bit(HCI_LE_SCAN, &hdev->dev_flags); |
1120 | 1117 | ||
1121 | schedule_delayed_work(&hdev->adv_work, ADV_CLEAR_TIMEOUT); | ||
1122 | |||
1123 | if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED && | 1118 | if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED && |
1124 | hdev->discovery.state == DISCOVERY_FINDING) { | 1119 | hdev->discovery.state == DISCOVERY_FINDING) { |
1125 | mgmt_interleaved_discovery(hdev); | 1120 | mgmt_interleaved_discovery(hdev); |
@@ -3353,8 +3348,6 @@ static inline void hci_le_adv_report_evt(struct hci_dev *hdev, | |||
3353 | while (num_reports--) { | 3348 | while (num_reports--) { |
3354 | struct hci_ev_le_advertising_info *ev = ptr; | 3349 | struct hci_ev_le_advertising_info *ev = ptr; |
3355 | 3350 | ||
3356 | hci_add_adv_entry(hdev, ev); | ||
3357 | |||
3358 | rssi = ev->data[ev->length]; | 3351 | rssi = ev->data[ev->length]; |
3359 | mgmt_device_found(hdev, &ev->bdaddr, LE_LINK, ev->bdaddr_type, | 3352 | mgmt_device_found(hdev, &ev->bdaddr, LE_LINK, ev->bdaddr_type, |
3360 | NULL, rssi, 0, 1, ev->data, ev->length); | 3353 | NULL, rssi, 0, 1, ev->data, ev->length); |