Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 23:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: Make LE only events conditional on supported commands

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

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2015-11-04 07:17:23 +01:00
parent 9fe759ceed
commit 5c3d3b4c4f
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/bluetooth/hci_core.c
View File

@ -534,13 +534,27 @@ static void hci_setup_event_mask(struct hci_request *req)
} else { } else {
/* Use a different default for LE-only devices */ /* Use a different default for LE-only devices */
memset(events, 0, sizeof(events)); 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] |= 0x20; /* Command Complete */
events[1] |= 0x40; /* Command Status */ events[1] |= 0x40; /* Command Status */
events[1] |= 0x80; /* Hardware Error */ events[1] |= 0x80; /* Hardware Error */
events[2] |= 0x04; /* Number of Completed Packets */
events[3] |= 0x02; /* Data Buffer Overflow */ /* 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) { if (hdev->le_features[0] & HCI_LE_ENCRYPTION) {
events[0] |= 0x80; /* Encryption Change */ events[0] |= 0x80; /* Encryption Change */