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

Commit 15a49cca authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Read LE Advertising Channel TX Power only when available 



The Read LE Advertising Channel TX Power command is not mandatory for
a Bluetooth HCI controller only supporting receiption. Move the command
to the third stage of the controller initialization and only execute it
when support for it has been indicated.

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

net/bluetooth/hci_core.c

+5 −3
Original line number Diff line number Diff line
@@ -1348,9 +1348,6 @@ static void le_setup(struct hci_request *req) 
	/* Read LE Supported States */

	hci_req_add(req, HCI_OP_LE_READ_SUPPORTED_STATES, 0, NULL);



	/* Read LE Advertising Channel TX Power */

	hci_req_add(req, HCI_OP_LE_READ_ADV_TX_POWER, 0, NULL);



	/* Read LE White List Size */

	hci_req_add(req, HCI_OP_LE_READ_WHITE_LIST_SIZE, 0, NULL);
@@ -1657,6 +1654,11 @@ static void hci_init3_req(struct hci_request *req, unsigned long opt) 
		hci_req_add(req, HCI_OP_LE_SET_EVENT_MASK, sizeof(events),

			    events);



		if (hdev->commands[25] & 0x40) {

			/* Read LE Advertising Channel TX Power */

			hci_req_add(req, HCI_OP_LE_READ_ADV_TX_POWER, 0, NULL);

		}



		hci_set_le_support(req);

	}