diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2012-11-07 19:23:01 -0500 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-11-18 20:03:01 -0500 |
| commit | c1d5dc4ac15be45c7061e207f06ad8dfba0c2170 (patch) | |
| tree | 5d5cca115c893e3ecf7f6839ebc3346a4db64523 /net/bluetooth | |
| parent | 3f0f524bafcd2025c12e215f13207c7be0a13bf9 (diff) | |
Bluetooth: Fix updating advertising state flags and data
This patch adds a callback for the HCI_LE_Set_Advertise_Enable command.
The callback is responsible for updating the HCI_LE_PERIPHERAL flag
updating as well as updating the advertising data flags field to
indicate undirected connectable advertising.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_event.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 7caea1af557b..9f5c5f244502 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
| @@ -1190,6 +1190,33 @@ static void hci_cc_read_local_oob_data_reply(struct hci_dev *hdev, | |||
| 1190 | hci_dev_unlock(hdev); | 1190 | hci_dev_unlock(hdev); |
| 1191 | } | 1191 | } |
| 1192 | 1192 | ||
| 1193 | static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb) | ||
| 1194 | { | ||
| 1195 | __u8 *sent, status = *((__u8 *) skb->data); | ||
| 1196 | |||
| 1197 | BT_DBG("%s status 0x%2.2x", hdev->name, status); | ||
| 1198 | |||
| 1199 | sent = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_ADV_ENABLE); | ||
| 1200 | if (!sent) | ||
| 1201 | return; | ||
| 1202 | |||
| 1203 | hci_dev_lock(hdev); | ||
| 1204 | |||
| 1205 | if (!status) { | ||
| 1206 | if (*sent) | ||
| 1207 | set_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags); | ||
| 1208 | else | ||
| 1209 | clear_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags); | ||
| 1210 | } | ||
| 1211 | |||
| 1212 | hci_dev_unlock(hdev); | ||
| 1213 | |||
| 1214 | if (!test_bit(HCI_INIT, &hdev->flags)) | ||
| 1215 | hci_update_ad(hdev); | ||
| 1216 | |||
| 1217 | hci_req_complete(hdev, HCI_OP_LE_SET_ADV_ENABLE, status); | ||
| 1218 | } | ||
| 1219 | |||
| 1193 | static void hci_cc_le_set_scan_param(struct hci_dev *hdev, struct sk_buff *skb) | 1220 | static void hci_cc_le_set_scan_param(struct hci_dev *hdev, struct sk_buff *skb) |
| 1194 | { | 1221 | { |
| 1195 | __u8 status = *((__u8 *) skb->data); | 1222 | __u8 status = *((__u8 *) skb->data); |
| @@ -2585,6 +2612,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
| 2585 | hci_cc_le_set_scan_param(hdev, skb); | 2612 | hci_cc_le_set_scan_param(hdev, skb); |
| 2586 | break; | 2613 | break; |
| 2587 | 2614 | ||
| 2615 | case HCI_OP_LE_SET_ADV_ENABLE: | ||
| 2616 | hci_cc_le_set_adv_enable(hdev, skb); | ||
| 2617 | break; | ||
| 2618 | |||
| 2588 | case HCI_OP_LE_SET_SCAN_ENABLE: | 2619 | case HCI_OP_LE_SET_SCAN_ENABLE: |
| 2589 | hci_cc_le_set_scan_enable(hdev, skb); | 2620 | hci_cc_le_set_scan_enable(hdev, skb); |
| 2590 | break; | 2621 | break; |
