Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76a388be authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

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: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 525e296a

include/net/bluetooth/hci.h

+2 −2
Original line number Diff line number Diff line
@@ -996,8 +996,8 @@ struct hci_cp_le_set_scan_param { 
	__u8    filter_policy;

} __packed;



#define LE_SCANNING_DISABLED		0x00

#define LE_SCANNING_ENABLED		0x01

#define LE_SCAN_DISABLE			0x00

#define LE_SCAN_ENABLE			0x01

#define LE_SCAN_FILTER_DUP_DISABLE	0x00

#define LE_SCAN_FILTER_DUP_ENABLE	0x01

net/bluetooth/hci_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/bluetooth/hci_event.c

+2 −2
Original line number Diff line number Diff line
@@ -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);