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

Commit 533553f8 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Track current configured LE scan type parameter 



The LE scan type paramter defines if active scanning or passive scanning
is in use. Track the currently set value so it can be used for decision
making from other pieces in the core.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent d986b4a6

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ struct hci_dev { 
	__u16		page_scan_window;

	__u8		page_scan_type;

	__u8		le_adv_channel_map;

	__u8		le_scan_type;

	__u16		le_scan_interval;

	__u16		le_scan_window;

	__u16		le_conn_min_interval;

net/bluetooth/hci_event.c

+25 −0
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) 
	memset(hdev->scan_rsp_data, 0, sizeof(hdev->scan_rsp_data));

	hdev->scan_rsp_data_len = 0;



	hdev->le_scan_type = LE_SCAN_PASSIVE;



	hdev->ssp_debug_mode = 0;

}
@@ -997,6 +999,25 @@ static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb) 
	hci_dev_unlock(hdev);

}



static void hci_cc_le_set_scan_param(struct hci_dev *hdev, struct sk_buff *skb)

{

	struct hci_cp_le_set_scan_param *cp;

	__u8 status = *((__u8 *) skb->data);



	BT_DBG("%s status 0x%2.2x", hdev->name, status);



	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_SCAN_PARAM);

	if (!cp)

		return;



	hci_dev_lock(hdev);



	if (!status)

		hdev->le_scan_type = cp->type;



	hci_dev_unlock(hdev);

}



static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,

				      struct sk_buff *skb)

{
@@ -2488,6 +2509,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		hci_cc_le_set_adv_enable(hdev, skb);

		break;



	case HCI_OP_LE_SET_SCAN_PARAM:

		hci_cc_le_set_scan_param(hdev, skb);

		break;



	case HCI_OP_LE_SET_SCAN_ENABLE:

		hci_cc_le_set_scan_enable(hdev, skb);

		break;