aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@openbossa.org>2011-11-25 18:53:38 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2011-12-02 07:19:18 -0500
commitd23264a896a931c4b355c102d8e9d46649195ba4 (patch)
tree0b751414ac34570568591c6b739dfc0857c0196b /net/bluetooth/hci_event.c
parent1e89cffb44a94e1937e5ec16125ae866dbba7b2e (diff)
Bluetooth: Add dev_flags to struct hci_dev
This patch adds the dev_flags field to struct hci_dev. This new flags variable should be used to define flags related to BR/EDR and/or LE controller itself. It should be used to define flags which represents states from the controller. The dev_flags is cleared in case the controller sends a Reset Command Complete Event to the host. Also, this patch adds the HCI_LE_SCAN flag which was created to track if the controller is performing LE scan or not. The flag is set/cleared when the controller starts/stops scanning. This is an initial effort to stop using hdev->flags to define internal flags since it is exported to userspace by an ioctl. Signed-off-by: Andre Guedes <andre.guedes@openbossa.org> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index ab4922831b9a..acbdfbeeb920 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -194,6 +194,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
194 clear_bit(HCI_RESET, &hdev->flags); 194 clear_bit(HCI_RESET, &hdev->flags);
195 195
196 hci_req_complete(hdev, HCI_OP_RESET, status); 196 hci_req_complete(hdev, HCI_OP_RESET, status);
197
198 hdev->dev_flags = 0;
197} 199}
198 200
199static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb) 201static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)
@@ -1006,12 +1008,16 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
1006 return; 1008 return;
1007 1009
1008 if (cp->enable == 0x01) { 1010 if (cp->enable == 0x01) {
1011 set_bit(HCI_LE_SCAN, &hdev->dev_flags);
1012
1009 del_timer(&hdev->adv_timer); 1013 del_timer(&hdev->adv_timer);
1010 1014
1011 hci_dev_lock(hdev); 1015 hci_dev_lock(hdev);
1012 hci_adv_entries_clear(hdev); 1016 hci_adv_entries_clear(hdev);
1013 hci_dev_unlock(hdev); 1017 hci_dev_unlock(hdev);
1014 } else if (cp->enable == 0x00) { 1018 } else if (cp->enable == 0x00) {
1019 clear_bit(HCI_LE_SCAN, &hdev->dev_flags);
1020
1015 mod_timer(&hdev->adv_timer, jiffies + ADV_CLEAR_TIMEOUT); 1021 mod_timer(&hdev->adv_timer, jiffies + ADV_CLEAR_TIMEOUT);
1016 } 1022 }
1017} 1023}