diff options
author | Andre Guedes <andre.guedes@openbossa.org> | 2014-07-01 17:10:10 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-07-03 11:42:55 -0400 |
commit | 662bc2e63de765bb701e3d3eca6af9fe553d72ac (patch) | |
tree | 7645147a3ebe1edbaebf85ce1a92a4a25df12e72 | |
parent | 9193c6e884ae1b403f53ca1370a4b7f8185c547b (diff) |
Bluetooth: Enable new LE meta event
The Bluetooth 4.1 introduces a new LE meta event called "LE Remote
Connection Parameter Request" event. In order to the controller
sends this event to host, we should enable it during controller
initialization.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r-- | include/net/bluetooth/hci.h | 3 | ||||
-rw-r--r-- | net/bluetooth/hci_core.c | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 95b754785a7d..66358af6b1fc 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
@@ -307,6 +307,9 @@ enum { | |||
307 | #define LMP_HOST_LE_BREDR 0x04 | 307 | #define LMP_HOST_LE_BREDR 0x04 |
308 | #define LMP_HOST_SC 0x08 | 308 | #define LMP_HOST_SC 0x08 |
309 | 309 | ||
310 | /* LE features */ | ||
311 | #define HCI_LE_CONN_PARAM_REQ_PROC 0x02 | ||
312 | |||
310 | /* Connection modes */ | 313 | /* Connection modes */ |
311 | #define HCI_CM_ACTIVE 0x0000 | 314 | #define HCI_CM_ACTIVE 0x0000 |
312 | #define HCI_CM_HOLD 0x0001 | 315 | #define HCI_CM_HOLD 0x0001 |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 5788e031b869..615d0cf5e511 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1611,6 +1611,15 @@ static void hci_init3_req(struct hci_request *req, unsigned long opt) | |||
1611 | 1611 | ||
1612 | memset(events, 0, sizeof(events)); | 1612 | memset(events, 0, sizeof(events)); |
1613 | events[0] = 0x1f; | 1613 | events[0] = 0x1f; |
1614 | |||
1615 | /* If controller supports the Connection Parameters Request | ||
1616 | * Link Layer Procedure, enable the corresponding event. | ||
1617 | */ | ||
1618 | if (hdev->le_features[0] & HCI_LE_CONN_PARAM_REQ_PROC) | ||
1619 | events[0] |= 0x20; /* LE Remote Connection | ||
1620 | * Parameter Request | ||
1621 | */ | ||
1622 | |||
1614 | hci_req_add(req, HCI_OP_LE_SET_EVENT_MASK, sizeof(events), | 1623 | hci_req_add(req, HCI_OP_LE_SET_EVENT_MASK, sizeof(events), |
1615 | events); | 1624 | events); |
1616 | 1625 | ||