Re: [PATCH v4 6/7] Bluetooth: Notify adv monitor removed event

[Jakub Kicinski]

On Fri, 12 Jun 2020 16:45:55 -0700 Miao-chen Chou wrote:
> This notifies management sockets on MGMT_EV_ADV_MONITOR_REMOVED event.
> 
> The following test was performed.
> - Start two btmgmt consoles, issue a btmgmt advmon-remove command on one
> console and observe a MGMT_EV_ADV_MONITOR_REMOVED event on the other.
> 
> Signed-off-by: Miao-chen Chou 


net/bluetooth/mgmt.c:4047:54: warning: incorrect type in argument 3 (different 
base types)
net/bluetooth/mgmt.c:4047:54:expected unsigned short [usertype] handle
net/bluetooth/mgmt.c:4047:54:got restricted __le16 [usertype] monitor_handle

[PATCH v4 6/7] Bluetooth: Notify adv monitor removed event

[Miao-chen Chou]

This notifies management sockets on MGMT_EV_ADV_MONITOR_REMOVED event.

The following test was performed.
- Start two btmgmt consoles, issue a btmgmt advmon-remove command on one
console and observe a MGMT_EV_ADV_MONITOR_REMOVED event on the other.

Signed-off-by: Miao-chen Chou 
---

Changes in v4: None
Changes in v3:
- Convert the endianness of the returned handle.

Changes in v2: None

 net/bluetooth/mgmt.c | 17 +
 1 file changed, 17 insertions(+)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 0a1e89ce75eae..325e528a1773e 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -156,6 +156,7 @@ static const u16 mgmt_events[] = {
MGMT_EV_PHY_CONFIGURATION_CHANGED,
MGMT_EV_EXP_FEATURE_CHANGED,
MGMT_EV_ADV_MONITOR_ADDED,
+   MGMT_EV_ADV_MONITOR_REMOVED,
 };
 
 static const u16 mgmt_untrusted_commands[] = {
@@ -3864,6 +3865,16 @@ static void mgmt_adv_monitor_added(struct sock *sk, 
struct hci_dev *hdev,
mgmt_event(MGMT_EV_ADV_MONITOR_ADDED, hdev, , sizeof(ev), sk);
 }
 
+static void mgmt_adv_monitor_removed(struct sock *sk, struct hci_dev *hdev,
+u16 handle)
+{
+   struct mgmt_ev_adv_monitor_added ev;
+
+   ev.monitor_handle = cpu_to_le16(handle);
+
+   mgmt_event(MGMT_EV_ADV_MONITOR_REMOVED, hdev, , sizeof(ev), sk);
+}
+
 static int read_adv_monitor_features(struct sock *sk, struct hci_dev *hdev,
 void *data, u16 len)
 {
@@ -4016,12 +4027,15 @@ static int remove_adv_monitor(struct sock *sk, struct 
hci_dev *hdev,
 {
struct mgmt_cp_remove_adv_monitor *cp = data;
struct mgmt_rp_remove_adv_monitor rp;
+   unsigned int prev_adv_monitors_cnt;
int err;
 
BT_DBG("request for %s", hdev->name);
 
hci_dev_lock(hdev);
 
+   prev_adv_monitors_cnt = hdev->adv_monitors_cnt;
+
err = hci_remove_adv_monitor(hdev, __le16_to_cpu(cp->monitor_handle));
if (err == -ENOENT) {
err = mgmt_cmd_status(sk, hdev->id, MGMT_OP_REMOVE_ADV_MONITOR,
@@ -4029,6 +4043,9 @@ static int remove_adv_monitor(struct sock *sk, struct 
hci_dev *hdev,
goto unlock;
}
 
+   if (hdev->adv_monitors_cnt < prev_adv_monitors_cnt)
+   mgmt_adv_monitor_removed(sk, hdev, cp->monitor_handle);
+
hci_dev_unlock(hdev);
 
rp.monitor_handle = cp->monitor_handle;
-- 
2.26.2