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

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

Bluetooth: Advertising entries lifetime 



This patch adds a timer to clear 'adv_entries' after three minutes.

After some amount of time, the advertising entries cached during
the last LE scan should be considered expired and they should be
removed from the advertising cache.

It was chosen a three minutes timeout as an initial attempt. This
value might change in future.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent eb9d91f5

include/net/bluetooth/hci_core.h

+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ struct hci_dev { 
	struct list_head	remote_oob_data;



	struct list_head	adv_entries;

	struct timer_list	adv_timer;



	struct hci_dev_stats	stat;
@@ -535,6 +536,7 @@ 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,

net/bluetooth/hci_core.c

+14 −0
Original line number Diff line number Diff line
@@ -1202,6 +1202,17 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *hash, 
	return 0;

}



static void hci_clear_adv_cache(unsigned long arg)

{

	struct hci_dev *hdev = (void *) arg;



	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;
@@ -1330,6 +1341,8 @@ int hci_register_dev(struct hci_dev *hdev) 
	INIT_LIST_HEAD(&hdev->remote_oob_data);



	INIT_LIST_HEAD(&hdev->adv_entries);

	setup_timer(&hdev->adv_timer, hci_clear_adv_cache,

						(unsigned long) hdev);



	INIT_WORK(&hdev->power_on, hci_power_on);

	INIT_WORK(&hdev->power_off, hci_power_off);
@@ -1403,6 +1416,7 @@ int hci_unregister_dev(struct hci_dev *hdev) 
	hci_unregister_sysfs(hdev);



	hci_del_off_timer(hdev);

	del_timer(&hdev->adv_timer);



	destroy_workqueue(hdev->workqueue);

net/bluetooth/hci_event.c

+5 −1
Original line number Diff line number Diff line
@@ -856,8 +856,12 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, 


	hci_dev_lock(hdev);



	if (cp->enable == 0x01)

	if (cp->enable == 0x01) {

		del_timer(&hdev->adv_timer);

		hci_adv_entries_clear(hdev);

	} else if (cp->enable == 0x00) {

		mod_timer(&hdev->adv_timer, jiffies + ADV_CLEAR_TIMEOUT);

	}



	hci_dev_unlock(hdev);

}