2 files changed, 7 insertions, 0 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index ef0423e62a22..dcbe1d29bb8e 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1458,6 +1458,7 @@ int hci_register_dev(struct hci_dev *hdev)
         spin_lock_init(&hdev->lock);
 
         hdev->flags = 0;
+        hdev->dev_flags = 0;
         hdev->pkt_type  = (HCI_DM1 | HCI_DH1 | HCI_HV1);
         hdev->esco_type = (ESCO_HV1);
         hdev->link_mode = (HCI_LM_ACCEPT);
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)
         clear_bit(HCI_RESET, &hdev->flags);
 
         hci_req_complete(hdev, HCI_OP_RESET, status);
+
+        hdev->dev_flags = 0;
 }
 
 static 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,
                 return;
 
         if (cp->enable == 0x01) {
+                set_bit(HCI_LE_SCAN, &hdev->dev_flags);
+
                 del_timer(&hdev->adv_timer);
 
                 hci_dev_lock(hdev);
                 hci_adv_entries_clear(hdev);
                 hci_dev_unlock(hdev);
         } else if (cp->enable == 0x00) {
+                clear_bit(HCI_LE_SCAN, &hdev->dev_flags);
+
                 mod_timer(&hdev->adv_timer, jiffies + ADV_CLEAR_TIMEOUT);
         }
 }