Bluetooth: Rename LE_SCANNING_* macros

This patch renames LE_SCANNING_ENABLED and LE_SCANNING_DISABLED
macros to LE_SCAN_ENABLE and LE_SCAN_DISABLE in order to keep
the same prefix others LE scan macros have.

It also fixes le_scan_enable_req function so it uses the LE_SCAN_
ENABLE macro instead of a magic number.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

2 files changed, 3 insertions, 3 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index d0ae237ff819..ce82265f5619 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1989,7 +1989,7 @@ static void le_scan_enable_req(struct hci_request *req, unsigned long opt)
         struct hci_cp_le_set_scan_enable cp;
 
         memset(&cp, 0, sizeof(cp));
-        cp.enable = 1;
+        cp.enable = LE_SCAN_ENABLE;
         cp.filter_dup = LE_SCAN_FILTER_DUP_ENABLE;
 
         hci_req_add(req, HCI_OP_LE_SET_SCAN_ENABLE, sizeof(cp), &cp);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 3b2c0e07b25b..b93cd2eb5d58 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -964,7 +964,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
                 return;
 
         switch (cp->enable) {
-        case LE_SCANNING_ENABLED:
+        case LE_SCAN_ENABLE:
                 if (status) {
                         hci_dev_lock(hdev);
                         mgmt_start_discovery_failed(hdev, status);
@@ -979,7 +979,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
                 hci_dev_unlock(hdev);
                 break;
 
-        case LE_SCANNING_DISABLED:
+        case LE_SCAN_DISABLE:
                 if (status) {
                         hci_dev_lock(hdev);
                         mgmt_stop_discovery_failed(hdev, status);