3 files changed, 35 insertions, 35 deletions

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 82c397451261..869f6ad602d1 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1151,6 +1151,7 @@ int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
 int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
 bool mgmt_valid_hdev(struct hci_dev *hdev);
 int mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent);
+void mgmt_reenable_advertising(struct hci_dev *hdev);
 
 /* HCI info for socket */
 #define hci_pi(sk) ((struct hci_pinfo *) sk)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 6eaef6ed9522..224210ce82fc 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1796,40 +1796,6 @@ static u8 hci_to_mgmt_reason(u8 err)
         }
 }
 
-static void adv_enable_complete(struct hci_dev *hdev, u8 status)
-{
-        BT_DBG("%s status %u", hdev->name, status);
-
-        /* Clear the advertising mgmt setting if we failed to re-enable it */
-        if (status) {
-                clear_bit(HCI_ADVERTISING, &hdev->dev_flags);
-                mgmt_new_settings(hdev);
-        }
-}
-
-static void reenable_advertising(struct hci_dev *hdev)
-{
-        struct hci_request req;
-        u8 enable = 0x01;
-
-        if (hdev->conn_hash.le_num)
-                return;
-
-        if (!test_bit(HCI_ADVERTISING, &hdev->dev_flags))
-                return;
-
-        hci_req_init(&req, hdev);
-        hci_req_add(&req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &enable);
-
-        /* If this fails we have no option but to let user space know
-         * that we've disabled advertising.
-         */
-        if (hci_req_run(&req, adv_enable_complete) < 0) {
-                clear_bit(HCI_ADVERTISING, &hdev->dev_flags);
-                mgmt_new_settings(hdev);
-        }
-}
-
 static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_disconn_complete *ev = (void *) skb->data;
@@ -1878,7 +1844,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
                  * is timed out due to Directed Advertising."
                  */
                 if (type == LE_LINK)
-                        reenable_advertising(hdev);
+                        mgmt_reenable_advertising(hdev);
         }
 
 unlock:
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index b78a0eefe03e..381faf600195 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4660,3 +4660,36 @@ int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type)
         return mgmt_event(MGMT_EV_DEVICE_UNBLOCKED, hdev, &ev, sizeof(ev),
                           cmd ? cmd->sk : NULL);
 }
+
+static void adv_enable_complete(struct hci_dev *hdev, u8 status)
+{
+        BT_DBG("%s status %u", hdev->name, status);
+
+        /* Clear the advertising mgmt setting if we failed to re-enable it */
+        if (status) {
+                clear_bit(HCI_ADVERTISING, &hdev->dev_flags);
+                mgmt_new_settings(hdev);
+        }
+}
+
+void mgmt_reenable_advertising(struct hci_dev *hdev)
+{
+        struct hci_request req;
+
+        if (hdev->conn_hash.le_num)
+                return;
+
+        if (!test_bit(HCI_ADVERTISING, &hdev->dev_flags))
+                return;
+
+        hci_req_init(&req, hdev);
+        enable_advertising(&req);
+
+        /* If this fails we have no option but to let user space know
+         * that we've disabled advertising.
+         */
+        if (hci_req_run(&req, adv_enable_complete) < 0) {
+                clear_bit(HCI_ADVERTISING, &hdev->dev_flags);
+                mgmt_new_settings(hdev);
+        }
+}