Commit 5c3d3b4c authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: Make LE only events conditional on supported commands 



For the LE only controllers, there are events that should not be enabled
if the corresponding command is not supported.

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

net/bluetooth/hci_core.c

+18 −4
Original line number Diff line number Diff line
@@ -534,13 +534,27 @@ static void hci_setup_event_mask(struct hci_request *req) 
	} else {

		/* Use a different default for LE-only devices */

		memset(events, 0, sizeof(events));

		events[0] |= 0x10; /* Disconnection Complete */

		events[1] |= 0x08; /* Read Remote Version Information Complete */

		events[1] |= 0x20; /* Command Complete */

		events[1] |= 0x40; /* Command Status */

		events[1] |= 0x80; /* Hardware Error */



		/* If the controller supports the Disconnect command, enable

		 * the corresponding event. In addition enable packet flow

		 * control related events.

		 */

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

			events[0] |= 0x10; /* Disconnection Complete */

			events[2] |= 0x04; /* Number of Completed Packets */

			events[3] |= 0x02; /* Data Buffer Overflow */

		}



		/* If the controller supports the Read Remote Version

		 * Information command, enable the corresponding event.

		 */

		if (hdev->commands[2] & 0x80)

			events[1] |= 0x08; /* Read Remote Version Information

					    * Complete

					    */



		if (hdev->le_features[0] & HCI_LE_ENCRYPTION) {

			events[0] |= 0x80; /* Encryption Change */

CRA Git | Maintained and supported by SUSTech CRA and CCSE