Bluetooth: Advertising entries lifetime
authorAndre Guedes <andre.guedes@openbossa.org>
Thu, 26 May 2011 19:23:53 +0000 (16:23 -0300)
committerGustavo F. Padovan <padovan@profusion.mobi>
Wed, 8 Jun 2011 19:58:17 +0000 (16:58 -0300)
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: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
include/net/bluetooth/hci_core.h
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c

index 10dfb85ad6a17c5d2465cb7c1393a4fe856c9d8e..af4b0ed173a82f14b4f4cb8166b5ddbe5fb41b1c 100644 (file)
@@ -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,
index cc40f221f5e7b1820025d41c38c7e1b21da3b8c9..ff6b784c58c5343b59f13433d8be6e64fa63da51 100644 (file)
@@ -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);
 
index 056f7b2fa02f31fc75932ecd0a038ca665ffafb0..a90200cac11da1386d487ec52f34567f2b2cea40 100644 (file)
@@ -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);
 }