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

Commit 4a3ee763 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Update page scan parameters after successful write commands 



The page scan parameters (interval, window and type) stored in struct
hci_dev should not only be updated after successful reads but also after
successful writes. This patch adds the necessary handlers for the write
command complete events and updates the stored values through them.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent f332ec66

net/bluetooth/hci_event.c

+43 −0
Original line number Diff line number Diff line
@@ -614,6 +614,25 @@ static void hci_cc_read_page_scan_activity(struct hci_dev *hdev, 
	}

}



static void hci_cc_write_page_scan_activity(struct hci_dev *hdev,

					    struct sk_buff *skb)

{

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

	struct hci_cp_write_page_scan_activity *sent;



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



	if (status)

		return;



	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_PAGE_SCAN_ACTIVITY);

	if (!sent)

		return;



	hdev->page_scan_interval = __le16_to_cpu(sent->interval);

	hdev->page_scan_window = __le16_to_cpu(sent->window);

}



static void hci_cc_read_page_scan_type(struct hci_dev *hdev,

					   struct sk_buff *skb)

{
@@ -625,6 +644,22 @@ static void hci_cc_read_page_scan_type(struct hci_dev *hdev, 
		hdev->page_scan_type = rp->type;

}



static void hci_cc_write_page_scan_type(struct hci_dev *hdev,

					struct sk_buff *skb)

{

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

	u8 *type;



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



	if (status)

		return;



	type = hci_sent_cmd_data(hdev, HCI_OP_WRITE_PAGE_SCAN_TYPE);

	if (type)

		hdev->page_scan_type = *type;

}



static void hci_cc_read_data_block_size(struct hci_dev *hdev,

					struct sk_buff *skb)

{
@@ -2232,10 +2267,18 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		hci_cc_read_page_scan_activity(hdev, skb);

		break;



	case HCI_OP_WRITE_PAGE_SCAN_ACTIVITY:

		hci_cc_write_page_scan_activity(hdev, skb);

		break;



	case HCI_OP_READ_PAGE_SCAN_TYPE:

		hci_cc_read_page_scan_type(hdev, skb);

		break;



	case HCI_OP_WRITE_PAGE_SCAN_TYPE:

		hci_cc_write_page_scan_type(hdev, skb);

		break;



	case HCI_OP_READ_DATA_BLOCK_SIZE:

		hci_cc_read_data_block_size(hdev, skb);

		break;