summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-07-08 17:21:51 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-07-08 16:27:44 +0200
commitfbd96c151cdcadb0ce83b45747d738498d72aa9d (patch)
tree6ea5bb8ca6cd0c5770c1d680c697033b5f591764 /net
parent562064e654d42599ad986812adaded653f3b81df (diff)
downloadlinux-fbd96c151cdcadb0ce83b45747d738498d72aa9d.tar.gz
linux-fbd96c151cdcadb0ce83b45747d738498d72aa9d.tar.bz2
linux-fbd96c151cdcadb0ce83b45747d738498d72aa9d.zip
Bluetooth: Fix clearing HCI_LE_ADV for LE connections
All LE controllers always implicitly stop advertising when establishing connections. Therefore, be sure to clear the flag in the event handler for new LE connections. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_event.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 2b3d366e5d98..f6997901bdd7 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4097,6 +4097,11 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
hci_dev_lock(hdev);
+ /* All controllers implicitly stop advertising in the event of a
+ * connection, so ensure that the state bit is cleared.
+ */
+ clear_bit(HCI_LE_ADV, &hdev->dev_flags);
+
conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);
if (!conn) {
conn = hci_conn_add(hdev, LE_LINK, &ev->bdaddr);