Bluetooth: Remove redundant disable_advertising()
authorJaganath Kanakkassery <jaganath.k.os@gmail.com>
Mon, 11 Dec 2017 14:56:47 +0000 (20:26 +0530)
committerMarcel Holtmann <marcel@holtmann.org>
Tue, 12 Dec 2017 23:28:42 +0000 (00:28 +0100)
There is already __hci_req_disable_advertising() function for disabling,
so use it.

Signed-off-by: Jaganath Kanakkassery <jaganathx.kanakkassery@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/hci_request.c

index abc0f32..da59f82 100644 (file)
@@ -1985,13 +1985,6 @@ unlock:
        hci_dev_unlock(hdev);
 }
 
-static void disable_advertising(struct hci_request *req)
-{
-       u8 enable = 0x00;
-
-       hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &enable);
-}
-
 static int active_scan(struct hci_request *req, unsigned long opt)
 {
        uint16_t interval = opt;
@@ -2017,7 +2010,7 @@ static int active_scan(struct hci_request *req, unsigned long opt)
                cancel_adv_timeout(hdev);
                hci_dev_unlock(hdev);
 
-               disable_advertising(req);
+               __hci_req_disable_advertising(req);
        }
 
        /* If controller is scanning, it means the background scanning is