aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/bluetooth/hci.h4
-rw-r--r--net/bluetooth/hci_core.c2
-rw-r--r--net/bluetooth/hci_event.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 84c37abc48c1..e0512aaef4b8 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -996,8 +996,8 @@ struct hci_cp_le_set_scan_param {
996 __u8 filter_policy; 996 __u8 filter_policy;
997} __packed; 997} __packed;
998 998
999#define LE_SCANNING_DISABLED 0x00 999#define LE_SCAN_DISABLE 0x00
1000#define LE_SCANNING_ENABLED 0x01 1000#define LE_SCAN_ENABLE 0x01
1001#define LE_SCAN_FILTER_DUP_DISABLE 0x00 1001#define LE_SCAN_FILTER_DUP_DISABLE 0x00
1002#define LE_SCAN_FILTER_DUP_ENABLE 0x01 1002#define LE_SCAN_FILTER_DUP_ENABLE 0x01
1003 1003
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)
1989 struct hci_cp_le_set_scan_enable cp; 1989 struct hci_cp_le_set_scan_enable cp;
1990 1990
1991 memset(&cp, 0, sizeof(cp)); 1991 memset(&cp, 0, sizeof(cp));
1992 cp.enable = 1; 1992 cp.enable = LE_SCAN_ENABLE;
1993 cp.filter_dup = LE_SCAN_FILTER_DUP_ENABLE; 1993 cp.filter_dup = LE_SCAN_FILTER_DUP_ENABLE;
1994 1994
1995 hci_req_add(req, HCI_OP_LE_SET_SCAN_ENABLE, sizeof(cp), &cp); 1995 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,
964 return; 964 return;
965 965
966 switch (cp->enable) { 966 switch (cp->enable) {
967 case LE_SCANNING_ENABLED: 967 case LE_SCAN_ENABLE:
968 if (status) { 968 if (status) {
969 hci_dev_lock(hdev); 969 hci_dev_lock(hdev);
970 mgmt_start_discovery_failed(hdev, status); 970 mgmt_start_discovery_failed(hdev, status);
@@ -979,7 +979,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
979 hci_dev_unlock(hdev); 979 hci_dev_unlock(hdev);
980 break; 980 break;
981 981
982 case LE_SCANNING_DISABLED: 982 case LE_SCAN_DISABLE:
983 if (status) { 983 if (status) {
984 hci_dev_lock(hdev); 984 hci_dev_lock(hdev);
985 mgmt_stop_discovery_failed(hdev, status); 985 mgmt_stop_discovery_failed(hdev, status);