diff options
author | Andre Guedes <andre.guedes@openbossa.org> | 2013-04-30 14:29:27 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-06-22 19:23:49 -0400 |
commit | 1f9b9a5dc5bb8ee360db9d32b2090aac497ae82a (patch) | |
tree | 7abc1c4cfc4d36056336c0031638dc2a42e92c37 /net/bluetooth | |
parent | 44f3b0fbaa9bfa7a88577ee8c446d0a78cb1d73a (diff) |
Bluetooth: Make inquiry_cache_flush non-static
In order to use HCI request framework in start_discovery, we'll need
to call inquiry_cache_flush in mgmt.c. Therefore, this patch adds the
hci_ prefix to inquiry_cache_flush and makes it non-static.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/hci_core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index ace5e55fe5a3..43c63877c5b7 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -751,7 +751,7 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state) | |||
751 | hdev->discovery.state = state; | 751 | hdev->discovery.state = state; |
752 | } | 752 | } |
753 | 753 | ||
754 | static void inquiry_cache_flush(struct hci_dev *hdev) | 754 | void hci_inquiry_cache_flush(struct hci_dev *hdev) |
755 | { | 755 | { |
756 | struct discovery_state *cache = &hdev->discovery; | 756 | struct discovery_state *cache = &hdev->discovery; |
757 | struct inquiry_entry *p, *n; | 757 | struct inquiry_entry *p, *n; |
@@ -964,7 +964,7 @@ int hci_inquiry(void __user *arg) | |||
964 | hci_dev_lock(hdev); | 964 | hci_dev_lock(hdev); |
965 | if (inquiry_cache_age(hdev) > INQUIRY_CACHE_AGE_MAX || | 965 | if (inquiry_cache_age(hdev) > INQUIRY_CACHE_AGE_MAX || |
966 | inquiry_cache_empty(hdev) || ir.flags & IREQ_CACHE_FLUSH) { | 966 | inquiry_cache_empty(hdev) || ir.flags & IREQ_CACHE_FLUSH) { |
967 | inquiry_cache_flush(hdev); | 967 | hci_inquiry_cache_flush(hdev); |
968 | do_inquiry = 1; | 968 | do_inquiry = 1; |
969 | } | 969 | } |
970 | hci_dev_unlock(hdev); | 970 | hci_dev_unlock(hdev); |
@@ -1230,7 +1230,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) | |||
1230 | cancel_delayed_work_sync(&hdev->le_scan_disable); | 1230 | cancel_delayed_work_sync(&hdev->le_scan_disable); |
1231 | 1231 | ||
1232 | hci_dev_lock(hdev); | 1232 | hci_dev_lock(hdev); |
1233 | inquiry_cache_flush(hdev); | 1233 | hci_inquiry_cache_flush(hdev); |
1234 | hci_conn_hash_flush(hdev); | 1234 | hci_conn_hash_flush(hdev); |
1235 | hci_dev_unlock(hdev); | 1235 | hci_dev_unlock(hdev); |
1236 | 1236 | ||
@@ -1331,7 +1331,7 @@ int hci_dev_reset(__u16 dev) | |||
1331 | skb_queue_purge(&hdev->cmd_q); | 1331 | skb_queue_purge(&hdev->cmd_q); |
1332 | 1332 | ||
1333 | hci_dev_lock(hdev); | 1333 | hci_dev_lock(hdev); |
1334 | inquiry_cache_flush(hdev); | 1334 | hci_inquiry_cache_flush(hdev); |
1335 | hci_conn_hash_flush(hdev); | 1335 | hci_conn_hash_flush(hdev); |
1336 | hci_dev_unlock(hdev); | 1336 | hci_dev_unlock(hdev); |
1337 | 1337 | ||
@@ -3562,7 +3562,7 @@ int hci_do_inquiry(struct hci_dev *hdev, u8 length) | |||
3562 | if (test_bit(HCI_INQUIRY, &hdev->flags)) | 3562 | if (test_bit(HCI_INQUIRY, &hdev->flags)) |
3563 | return -EINPROGRESS; | 3563 | return -EINPROGRESS; |
3564 | 3564 | ||
3565 | inquiry_cache_flush(hdev); | 3565 | hci_inquiry_cache_flush(hdev); |
3566 | 3566 | ||
3567 | memset(&cp, 0, sizeof(cp)); | 3567 | memset(&cp, 0, sizeof(cp)); |
3568 | memcpy(&cp.lap, lap, sizeof(cp.lap)); | 3568 | memcpy(&cp.lap, lap, sizeof(cp.lap)); |