Changes made to add support for fast advertising interval as per
core 4.1 specification, section 9.3.11.2.
A peripheral device enetering any of the following GAP modes and
sending either non-connectable advertising events or scannable undirected
advertising events should use adv_fast_interval2(100ms - 150ms)
for adv_fast_period(30s).
- Non-Discoverable Mode
- Non-Connectable Mode
- Limited Discoverable Mode
- General Discoverable Mode
Signed-off-by: Bharat Bhusan Panda <bharat.b.panda@xxxxxxxxx>
---
include/net/bluetooth/hci_core.h | 2 ++
net/bluetooth/hci_request.c | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 0db1b9b..868c2fb 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1491,6 +1491,8 @@ struct hci_mgmt_chan {
#define DISCOV_INTERLEAVED_INQUIRY_LEN 0x04
#define DISCOV_BREDR_INQUIRY_LEN 0x08
#define DISCOV_LE_RESTART_DELAY msecs_to_jiffies(200) /* msec */
+#define DISCOV_LE_FAST_ADV_INT_MIN 100 /* msec */
+#define DISCOV_LE_FAST_ADV_INT_MAX 150 /* msec */
void mgmt_fill_version_info(void *ver);
int mgmt_new_settings(struct hci_dev *hdev);
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index e8c9ef1..8abe66f 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -1092,6 +1092,34 @@ void __hci_req_enable_advertising(struct hci_request *req)
else
cp.type = LE_ADV_NONCONN_IND;
+ /* As per core 4.1 spec, section 9.3.11.2: A peripheral device
+ * entering any of the following GAP modes and sending either
+ * non-connectable advertising events or scannable undirected
+ * advertising events should use adv_fast_interval2(100ms - 150ms)
+ * for adv_fast_period(30s).
+ *
+ * - Non-Discoverable Mode
+ * - Non-Connectable Mode
+ * - Limited Discoverable Mode
+ * - General Discoverable Mode
+ */
+ if (cp.type == LE_ADV_NONCONN_IND || cp.type == LE_ADV_SCAN_IND) {
+ /* Set the suggested min and max fast advertising interval,
+ * only if the peripheral device has entered any of the modes
+ * such as non-discoverable, non-connectable or limited-
+ * discoverable.
+ */
+ if ((!hci_dev_test_flag(hdev, HCI_DISCOVERABLE)) ||
+ (!hci_dev_test_flag(hdev, HCI_CONNECTABLE)) ||
+ (hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE)) ||
+ (hdev->discovery.limited == true)) {
+ cp.min_interval =
+ cpu_to_le16(DISCOV_LE_FAST_ADV_INT_MIN);
+ cp.max_interval =
+ cpu_to_le16(DISCOV_LE_FAST_ADV_INT_MAX);
+ }
+ }
+
cp.own_address_type = own_addr_type;
cp.channel_map = hdev->le_adv_channel_map;
--
1.9.1
