aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@openbossa.org>2013-04-30 14:29:37 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-06-22 19:23:51 -0400
commit917eedc56c65ba96a3bab4c346d948e73dd872f1 (patch)
treeacf175b02bc75f4e8bbaf106839e043d34526bdb /include/net
parent3fd319b830247a3fe5f489e622ab404b618e0906 (diff)
Bluetooth: Remove LE scan helpers
This patch removes the LE scan helpers hci_le_scan and hci_cancel_ le_scan and all code related to it. We now use the HCI request framework in device discovery functionality and these helpers are no longer needed. 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 'include/net')
-rw-r--r--include/net/bluetooth/hci_core.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 1b343ef37871..5de7eb95ef63 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -117,13 +117,6 @@ struct oob_data {
117 u8 randomizer[16]; 117 u8 randomizer[16];
118}; 118};
119 119
120struct le_scan_params {
121 u8 type;
122 u16 interval;
123 u16 window;
124 int timeout;
125};
126
127#define HCI_MAX_SHORT_NAME_LENGTH 10 120#define HCI_MAX_SHORT_NAME_LENGTH 10
128 121
129struct amp_assoc { 122struct amp_assoc {
@@ -283,9 +276,6 @@ struct hci_dev {
283 276
284 struct delayed_work le_scan_disable; 277 struct delayed_work le_scan_disable;
285 278
286 struct work_struct le_scan;
287 struct le_scan_params le_scan_params;
288
289 __s8 adv_tx_power; 279 __s8 adv_tx_power;
290 __u8 adv_data[HCI_MAX_AD_LENGTH]; 280 __u8 adv_data[HCI_MAX_AD_LENGTH];
291 __u8 adv_data_len; 281 __u8 adv_data_len;
@@ -1222,9 +1212,6 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],
1222 __u8 ltk[16]); 1212 __u8 ltk[16]);
1223int hci_do_inquiry(struct hci_dev *hdev, u8 length); 1213int hci_do_inquiry(struct hci_dev *hdev, u8 length);
1224int hci_cancel_inquiry(struct hci_dev *hdev); 1214int hci_cancel_inquiry(struct hci_dev *hdev);
1225int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window,
1226 int timeout);
1227int hci_cancel_le_scan(struct hci_dev *hdev);
1228 1215
1229u8 bdaddr_to_le(u8 bdaddr_type); 1216u8 bdaddr_to_le(u8 bdaddr_type);
1230 1217