aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_core.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-02-09 08:56:11 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 10:01:36 -0500
commit88c1fe4ba55c7245ad2f3c81689f854287875121 (patch)
tree69447c418d6f4560df19bc1a69a98a49cda0d4c9 /net/bluetooth/hci_core.c
parent664ce4cc293cd6c76236617f78689d0e03e69287 (diff)
Bluetooth: Add address type to mgmt blacklist messages
This patch updates the implmentation for mgmt_block_device and mgmt_unblock_device and their corresponding events to match the latest API specification. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r--net/bluetooth/hci_core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 3d09f4b4ca68..9ada16449aed 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1489,7 +1489,7 @@ int hci_blacklist_clear(struct hci_dev *hdev)
1489 return 0; 1489 return 0;
1490} 1490}
1491 1491
1492int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr) 1492int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type)
1493{ 1493{
1494 struct bdaddr_list *entry; 1494 struct bdaddr_list *entry;
1495 1495
@@ -1507,10 +1507,10 @@ int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr)
1507 1507
1508 list_add(&entry->list, &hdev->blacklist); 1508 list_add(&entry->list, &hdev->blacklist);
1509 1509
1510 return mgmt_device_blocked(hdev, bdaddr); 1510 return mgmt_device_blocked(hdev, bdaddr, type);
1511} 1511}
1512 1512
1513int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr) 1513int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type)
1514{ 1514{
1515 struct bdaddr_list *entry; 1515 struct bdaddr_list *entry;
1516 1516
@@ -1524,7 +1524,7 @@ int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr)
1524 list_del(&entry->list); 1524 list_del(&entry->list);
1525 kfree(entry); 1525 kfree(entry);
1526 1526
1527 return mgmt_device_unblocked(hdev, bdaddr); 1527 return mgmt_device_unblocked(hdev, bdaddr, type);
1528} 1528}
1529 1529
1530static void hci_clear_adv_cache(struct work_struct *work) 1530static void hci_clear_adv_cache(struct work_struct *work)