From: Archie Pusaka <apus...@chromium.org>

MSFT needs rssi parameter for monitoring advertisement packet,
therefore we should supply them from mgmt.

Signed-off-by: Archie Pusaka <apus...@chromium.org>
Reviewed-by: Miao-chen Chou <mcc...@chromium.org>
Reviewed-by: Yun-Hao Chung <howardch...@google.com>

---

 include/net/bluetooth/hci_core.h | 9 +++++++++
 include/net/bluetooth/mgmt.h     | 9 +++++++++
 net/bluetooth/mgmt.c             | 8 ++++++++
 3 files changed, 26 insertions(+)

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 9873e1c8cd16..42d446417817 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -246,8 +246,17 @@ struct adv_pattern {
        __u8 value[HCI_MAX_AD_LENGTH];
 };
 
+struct adv_rssi_thresholds {
+       __s8 low_threshold;
+       __s8 high_threshold;
+       __u16 low_threshold_timeout;
+       __u16 high_threshold_timeout;
+       __u8 sampling_period;
+};
+
 struct adv_monitor {
        struct list_head patterns;
+       struct adv_rssi_thresholds rssi;
        bool            active;
        __u16           handle;
 };
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index d8367850e8cd..dc534837be0e 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -763,9 +763,18 @@ struct mgmt_adv_pattern {
        __u8 value[31];
 } __packed;
 
+struct mgmt_adv_rssi_thresholds {
+       __s8 high_threshold;
+       __le16 high_threshold_timeout;
+       __s8 low_threshold;
+       __le16 low_threshold_timeout;
+       __u8 sampling_period;
+} __packed;
+
 #define MGMT_OP_ADD_ADV_PATTERNS_MONITOR       0x0052
 struct mgmt_cp_add_adv_patterns_monitor {
        __u8 pattern_count;
+       struct mgmt_adv_rssi_thresholds rssi;
        struct mgmt_adv_pattern patterns[];
 } __packed;
 #define MGMT_ADD_ADV_PATTERNS_MONITOR_SIZE     1
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 3dfed4efa078..5f0f03dcd81d 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4237,6 +4237,14 @@ static int add_adv_patterns_monitor(struct sock *sk, 
struct hci_dev *hdev,
        INIT_LIST_HEAD(&m->patterns);
        m->active = false;
 
+       m->rssi.low_threshold = cp->rssi.low_threshold;
+       m->rssi.low_threshold_timeout =
+           __le16_to_cpu(cp->rssi.low_threshold_timeout);
+       m->rssi.high_threshold = cp->rssi.high_threshold;
+       m->rssi.high_threshold_timeout =
+           __le16_to_cpu(cp->rssi.high_threshold_timeout);
+       m->rssi.sampling_period = cp->rssi.sampling_period;
+
        for (i = 0; i < cp->pattern_count; i++) {
                if (++mp_cnt > HCI_MAX_ADV_MONITOR_NUM_PATTERNS) {
                        err = mgmt_cmd_status(sk, hdev->id,
-- 
2.29.2.454.gaff20da3a2-goog

Reply via email to