Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 479453d5 authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

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: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 8e9f9892

include/net/bluetooth/hci_core.h

+0 −9
Original line number Diff line number Diff line
@@ -255,9 +255,6 @@ struct hci_dev { 


	struct list_head	remote_oob_data;



	struct list_head	adv_entries;

	struct delayed_work	adv_work;



	struct hci_dev_stats	stat;



	struct sk_buff_head	driver_init;
@@ -692,12 +689,6 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *hash, 
								u8 *randomizer);

int hci_remove_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr);



#define ADV_CLEAR_TIMEOUT (3*60*HZ) /* Three minutes */

int hci_adv_entries_clear(struct hci_dev *hdev);

struct adv_entry *hci_find_adv_entry(struct hci_dev *hdev, bdaddr_t *bdaddr);

int hci_add_adv_entry(struct hci_dev *hdev,

					struct hci_ev_le_advertising_info *ev);



void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);



int hci_recv_frame(struct sk_buff *skb);

net/bluetooth/hci_core.c

+0 −74
Original line number Diff line number Diff line
@@ -1521,75 +1521,6 @@ int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type) 
	return mgmt_device_unblocked(hdev, bdaddr, type);

}



static void hci_clear_adv_cache(struct work_struct *work)

{

	struct hci_dev *hdev = container_of(work, struct hci_dev,

					    adv_work.work);



	hci_dev_lock(hdev);



	hci_adv_entries_clear(hdev);



	hci_dev_unlock(hdev);

}



int hci_adv_entries_clear(struct hci_dev *hdev)

{

	struct adv_entry *entry, *tmp;



	list_for_each_entry_safe(entry, tmp, &hdev->adv_entries, list) {

		list_del(&entry->list);

		kfree(entry);

	}



	BT_DBG("%s adv cache cleared", hdev->name);



	return 0;

}



struct adv_entry *hci_find_adv_entry(struct hci_dev *hdev, bdaddr_t *bdaddr)

{

	struct adv_entry *entry;



	list_for_each_entry(entry, &hdev->adv_entries, list)

		if (bacmp(bdaddr, &entry->bdaddr) == 0)

			return entry;



	return NULL;

}



static inline int is_connectable_adv(u8 evt_type)

{

	if (evt_type == ADV_IND || evt_type == ADV_DIRECT_IND)

		return 1;



	return 0;

}



int hci_add_adv_entry(struct hci_dev *hdev,

					struct hci_ev_le_advertising_info *ev) { struct adv_entry *entry; if (!is_connectable_adv(ev->evt_type))

		return -EINVAL;



	/* Only new entries should be added to adv_entries. So, if

	 * bdaddr was found, don't add it. */

	if (hci_find_adv_entry(hdev, &ev->bdaddr))

		return 0;



	entry = kzalloc(sizeof(*entry), GFP_KERNEL);

	if (!entry)

		return -ENOMEM;



	bacpy(&entry->bdaddr, &ev->bdaddr);

	entry->bdaddr_type = ev->bdaddr_type;



	list_add(&entry->list, &hdev->adv_entries);



	BT_DBG("%s adv entry added: address %s type %u", hdev->name,

				batostr(&entry->bdaddr), entry->bdaddr_type);



	return 0;

}



static void le_scan_param_req(struct hci_dev *hdev, unsigned long opt)

{

	struct le_scan_params *param =  (struct le_scan_params *) opt;
@@ -1735,7 +1666,6 @@ struct hci_dev *hci_alloc_dev(void) 
	INIT_LIST_HEAD(&hdev->link_keys);

	INIT_LIST_HEAD(&hdev->long_term_keys);

	INIT_LIST_HEAD(&hdev->remote_oob_data);

	INIT_LIST_HEAD(&hdev->adv_entries);



	INIT_WORK(&hdev->rx_work, hci_rx_work);

	INIT_WORK(&hdev->cmd_work, hci_cmd_work);
@@ -1743,7 +1673,6 @@ struct hci_dev *hci_alloc_dev(void) 
	INIT_WORK(&hdev->power_on, hci_power_on);

	INIT_WORK(&hdev->le_scan, le_scan_work);



	INIT_DELAYED_WORK(&hdev->adv_work, hci_clear_adv_cache);

	INIT_DELAYED_WORK(&hdev->power_off, hci_power_off);

	INIT_DELAYED_WORK(&hdev->discov_off, hci_discov_off);

	INIT_DELAYED_WORK(&hdev->le_scan_disable, le_scan_disable_work);
@@ -1889,8 +1818,6 @@ void hci_unregister_dev(struct hci_dev *hdev) 


	hci_del_sysfs(hdev);



	cancel_delayed_work_sync(&hdev->adv_work);



	destroy_workqueue(hdev->workqueue);



	hci_dev_lock(hdev);
@@ -1899,7 +1826,6 @@ void hci_unregister_dev(struct hci_dev *hdev) 
	hci_link_keys_clear(hdev);

	hci_smp_ltks_clear(hdev);

	hci_remote_oob_data_clear(hdev);

	hci_adv_entries_clear(hdev);

	hci_dev_unlock(hdev);



	hci_dev_put(hdev);

net/bluetooth/hci_event.c

+0 −7
Original line number Diff line number Diff line
@@ -1100,10 +1100,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, 


		set_bit(HCI_LE_SCAN, &hdev->dev_flags);



		cancel_delayed_work_sync(&hdev->adv_work);



		hci_dev_lock(hdev);

		hci_adv_entries_clear(hdev);

		hci_discovery_set_state(hdev, DISCOVERY_FINDING);

		hci_dev_unlock(hdev);

		break;
@@ -1118,8 +1115,6 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, 


		clear_bit(HCI_LE_SCAN, &hdev->dev_flags);



		schedule_delayed_work(&hdev->adv_work, ADV_CLEAR_TIMEOUT);



		if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED &&

		    hdev->discovery.state == DISCOVERY_FINDING) {

			mgmt_interleaved_discovery(hdev);
@@ -3353,8 +3348,6 @@ static inline void hci_le_adv_report_evt(struct hci_dev *hdev, 
	while (num_reports--) {

		struct hci_ev_le_advertising_info *ev = ptr;



		hci_add_adv_entry(hdev, ev);



		rssi = ev->data[ev->length];

		mgmt_device_found(hdev, &ev->bdaddr, LE_LINK, ev->bdaddr_type,

				  NULL, rssi, 0, 1, ev->data, ev->length);