mac80211: support active monitor interfaces

Support them only if the driver advertises support for them via
IEEE80211_HW_SUPPORTS_ACTIVE_MONITOR. Unlike normal monitor interfaces,
they are added to the driver, along with their MAC address.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 232edf78d5a9..9034da16cf1b 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -73,16 +73,19 @@ static int ieee80211_change_iface(struct wiphy *wiphy,
                 struct ieee80211_local *local = sdata->local;
 
                 if (ieee80211_sdata_running(sdata)) {
+                        u32 mask = MONITOR_FLAG_COOK_FRAMES |
+                                   MONITOR_FLAG_ACTIVE;
+
                         /*
-                         * Prohibit MONITOR_FLAG_COOK_FRAMES to be
-                         * changed while the interface is up.
+                         * Prohibit MONITOR_FLAG_COOK_FRAMES and
+                         * MONITOR_FLAG_ACTIVE to be changed while the
+                         * interface is up.
                          * Else we would need to add a lot of cruft
                          * to update everything:
                          *      cooked_mntrs, monitor and all fif_* counters
                          *      reconfigure hardware
                          */
-                        if ((*flags & MONITOR_FLAG_COOK_FRAMES) !=
-                            (sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES))
+                        if ((*flags & mask) != (sdata->u.mntr_flags & mask))
                                 return -EBUSY;
 
                         ieee80211_adjust_monitor_flags(sdata, -1);