Commit c7882cbd authored Aug 13, 2013 by Marcel Holtmann Committed by Gustavo Padovan Aug 21, 2013

Bluetooth: Set different event mask for LE-only controllers



In case of a Low Energy only controller it makes no sense to configure
the full BR/EDR event mask. It will just enable events that can not be
send anyway and there is no guarantee that such a controller will accept
this value.

Use event mask 0x90 0xe8 0x04 0x02 0x00 0x80 0x00 0x20 for LE-only
controllers which enables the following events:

          Disconnection Complete
          Encryption Change
          Read Remote Version Information Complete
          Command Complete
          Command Status
          Hardware Error
          Number of Completed Packets
          Data Buffer Overflow
          Encryption Key Refresh Complete
          LE Meta

This is according to Core Specification, Part E, Section 3.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

parent 9d225d22

net/bluetooth/hci_core.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -454,6 +454,18 @@ static void hci_setup_event_mask(struct hci_request *req)
		events[4] \|= 0x04; /* Read Remote Extended Features Complete */
		events[5] \|= 0x08; /* Synchronous Connection Complete */
		events[5] \|= 0x10; /* Synchronous Connection Changed */
		} else {
		/* Use a different default for LE-only devices */
		memset(events, 0, sizeof(events));
		events[0] \|= 0x10; /* Disconnection Complete */
		events[0] \|= 0x80; /* Encryption Change */
		events[1] \|= 0x08; /* Read Remote Version Information Complete */
		events[1] \|= 0x20; /* Command Complete */
		events[1] \|= 0x40; /* Command Status */
		events[1] \|= 0x80; /* Hardware Error */
		events[2] \|= 0x04; /* Number of Completed Packets */
		events[3] \|= 0x02; /* Data Buffer Overflow */
		events[5] \|= 0x80; /* Encryption Key Refresh Complete */
		}

		if (lmp_inq_rssi_capable(hdev))

Original line number	Diff line number	Diff line
		@@ -454,6 +454,18 @@ static void hci_setup_event_mask(struct hci_request *req)
		events[4] \|= 0x04; /* Read Remote Extended Features Complete */
		events[5] \|= 0x08; /* Synchronous Connection Complete */
		events[5] \|= 0x10; /* Synchronous Connection Changed */
		} else {
		/* Use a different default for LE-only devices */
		memset(events, 0, sizeof(events));
		events[0] \|= 0x10; /* Disconnection Complete */
		events[0] \|= 0x80; /* Encryption Change */
		events[1] \|= 0x08; /* Read Remote Version Information Complete */
		events[1] \|= 0x20; /* Command Complete */
		events[1] \|= 0x40; /* Command Status */
		events[1] \|= 0x80; /* Hardware Error */
		events[2] \|= 0x04; /* Number of Completed Packets */
		events[3] \|= 0x02; /* Data Buffer Overflow */
		events[5] \|= 0x80; /* Encryption Key Refresh Complete */
		}

		if (lmp_inq_rssi_capable(hdev))

Admin message