From: Spoorthi Ravishankar Koppad <[email protected]>
Changes made to add support for fast advertising interval
as per core 4.1 specification, 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
Signed-off-by: Spoorthi Ravishankar Koppad <[email protected]>
---
include/net/bluetooth/hci_core.h | 2 ++
net/bluetooth/hci_request.c | 25 +++++++++++++++++--------
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 7dfe6ff..a69534d 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1512,6 +1512,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 d4ecf71..6d8ffcc 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -1199,15 +1199,24 @@ void __hci_req_enable_advertising(struct hci_request *req)
return;
memset(&cp, 0, sizeof(cp));
- cp.min_interval = cpu_to_le16(hdev->le_adv_min_interval);
- cp.max_interval = cpu_to_le16(hdev->le_adv_max_interval);
-
- if (connectable)
+ if (connectable) {
cp.type = LE_ADV_IND;
- else if (get_cur_adv_instance_scan_rsp_len(hdev))
- cp.type = LE_ADV_SCAN_IND;
- else
- cp.type = LE_ADV_NONCONN_IND;
+ cp.min_interval = cpu_to_le16(hdev->le_adv_min_interval);
+ cp.max_interval = cpu_to_le16(hdev->le_adv_max_interval);
+ } else {
+ if (get_cur_adv_instance_scan_rsp_len(hdev))
+ cp.type = LE_ADV_SCAN_IND;
+ else
+ cp.type = LE_ADV_NONCONN_IND;
+
+ if (!hci_dev_test_flag(hdev, HCI_DISCOVERABLE) ||
+ hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE)) {
+ 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
Hi Spoorthi,
> Changes made to add support for fast advertising interval
> as per core 4.1 specification, 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
>
> Signed-off-by: Spoorthi Ravishankar Koppad <[email protected]>
> ---
> include/net/bluetooth/hci_core.h | 2 ++
> net/bluetooth/hci_request.c | 25 +++++++++++++++++--------
> 2 files changed, 19 insertions(+), 8 deletions(-)
>
> diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
> index 7dfe6ff..a69534d 100644
> --- a/include/net/bluetooth/hci_core.h
> +++ b/include/net/bluetooth/hci_core.h
> @@ -1512,6 +1512,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 d4ecf71..6d8ffcc 100644
> --- a/net/bluetooth/hci_request.c
> +++ b/net/bluetooth/hci_request.c
> @@ -1199,15 +1199,24 @@ void __hci_req_enable_advertising(struct hci_request *req)
> return;
>
> memset(&cp, 0, sizeof(cp));
> - cp.min_interval = cpu_to_le16(hdev->le_adv_min_interval);
> - cp.max_interval = cpu_to_le16(hdev->le_adv_max_interval);
> -
> - if (connectable)
> + if (connectable) {
> cp.type = LE_ADV_IND;
> - else if (get_cur_adv_instance_scan_rsp_len(hdev))
> - cp.type = LE_ADV_SCAN_IND;
> - else
> - cp.type = LE_ADV_NONCONN_IND;
> + cp.min_interval = cpu_to_le16(hdev->le_adv_min_interval);
> + cp.max_interval = cpu_to_le16(hdev->le_adv_max_interval);
> + } else {
> + if (get_cur_adv_instance_scan_rsp_len(hdev))
> + cp.type = LE_ADV_SCAN_IND;
> + else
> + cp.type = LE_ADV_NONCONN_IND;
> +
> + if (!hci_dev_test_flag(hdev, HCI_DISCOVERABLE) ||
> + hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE)) {
> + cp.min_interval =
> + cpu_to_le16(DISCOV_LE_FAST_ADV_INT_MIN);
> + cp.max_interval =
> + cpu_to_le16(DISCOV_LE_FAST_ADV_INT_MAX);
> + }
isn’t this missing an else clause?
> + }
>
> cp.own_address_type = own_addr_type;
> cp.channel_map = hdev->le_adv_channel_map;
I would move this block up right after the memset().
Regards
Marcel