2017-12-11 14:56:47

by Jaganath K

Subject: [PATCH] Bluetooth: Remove redundant disable_advertising()

There is already __hci_req_disable_advertising() function for disabling,
so use it.

Signed-off-by: Jaganath Kanakkassery <[email protected]>
---
net/bluetooth/hci_request.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index abc0f32..da59f82 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -1985,13 +1985,6 @@ static void le_scan_restart_work(struct work_struct *work)
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
--
2.7.4

2017-12-11 19:02:27

by Marcel Holtmann

Subject: Re: [PATCH] Bluetooth: Remove redundant disable_advertising()

Hi Jaganath,

> There is already __hci_req_disable_advertising() function for disabling,
> so use it.
>
> Signed-off-by: Jaganath Kanakkassery <[email protected]>
> ---
> net/bluetooth/hci_request.c | 9 +--------
> 1 file changed, 1 insertion(+), 8 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel