lkml.org 
[lkml]   [2020]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v3 6/6] Bluetooth: Add toggle to switch off interleave scan
    From
    This patch add a configurable parameter to switch off the interleave
    scan feature.

    Signed-off-by: Howard Chung <howardchung@google.com>
    Reviewed-by: Alain Michaud <alainm@chromium.org>
    ---

    (no changes since v1)

    include/net/bluetooth/hci_core.h | 1 +
    net/bluetooth/hci_core.c | 1 +
    net/bluetooth/hci_request.c | 3 ++-
    net/bluetooth/mgmt_config.c | 6 ++++++
    4 files changed, 10 insertions(+), 1 deletion(-)

    diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
    index 179350f869fdb..c3253f1cac0c2 100644
    --- a/include/net/bluetooth/hci_core.h
    +++ b/include/net/bluetooth/hci_core.h
    @@ -363,6 +363,7 @@ struct hci_dev {
    __u32 clock;
    __u16 advmon_allowlist_duration;
    __u16 advmon_no_filter_duration;
    + __u16 enable_advmon_interleave_scan;

    __u16 devid_source;
    __u16 devid_vendor;
    diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
    index 6c8850149265a..4608715860cce 100644
    --- a/net/bluetooth/hci_core.c
    +++ b/net/bluetooth/hci_core.c
    @@ -3595,6 +3595,7 @@ struct hci_dev *hci_alloc_dev(void)
    /* The default values will be chosen in the future */
    hdev->advmon_allowlist_duration = 300;
    hdev->advmon_no_filter_duration = 500;
    + hdev->enable_advmon_interleave_scan = 0x0001; /* Default to enable */

    hdev->sniff_max_interval = 800;
    hdev->sniff_min_interval = 80;
    diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
    index 1fcf6736811e4..bb38e1dead68f 100644
    --- a/net/bluetooth/hci_request.c
    +++ b/net/bluetooth/hci_request.c
    @@ -500,7 +500,8 @@ static void __hci_update_background_scan(struct hci_request *req)
    if (hci_dev_test_flag(hdev, HCI_LE_SCAN))
    hci_req_add_le_scan_disable(req, false);

    - if (!update_adv_monitor_scan_state(hdev)) {
    + if (!hdev->enable_advmon_interleave_scan ||
    + !update_adv_monitor_scan_state(hdev)) {
    hci_req_add_le_passive_scan(req);
    bt_dev_dbg(hdev, "%s starting background scanning",
    hdev->name);
    diff --git a/net/bluetooth/mgmt_config.c b/net/bluetooth/mgmt_config.c
    index 1802f7023158c..b4198c33a1b72 100644
    --- a/net/bluetooth/mgmt_config.c
    +++ b/net/bluetooth/mgmt_config.c
    @@ -69,6 +69,7 @@ int read_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
    def_le_autoconnect_timeout),
    HDEV_PARAM_U16(0x001d, advmon_allowlist_duration),
    HDEV_PARAM_U16(0x001e, advmon_no_filter_duration),
    + HDEV_PARAM_U16(0x001f, enable_advmon_interleave_scan),
    };
    struct mgmt_rp_read_def_system_config *rp = (void *)params;

    @@ -142,6 +143,7 @@ int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
    case 0x001b:
    case 0x001d:
    case 0x001e:
    + case 0x001f:
    if (len != sizeof(u16)) {
    bt_dev_warn(hdev, "invalid length %d, exp %zu for type %d",
    len, sizeof(u16), type);
    @@ -263,6 +265,10 @@ int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
    hdev->advmon_no_filter_duration =
    TLV_GET_LE16(buffer);
    break;
    + case 0x0001f:
    + hdev->enable_advmon_interleave_scan =
    + TLV_GET_LE16(buffer);
    + break;
    default:
    bt_dev_warn(hdev, "unsupported parameter %u", type);
    break;
    --
    2.28.0.681.g6f77f65b4e-goog
    \
     
     \ /
      Last update: 2022-09-17 16:08    [W:5.806 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site