mac80211: Process multicast RX registration for Action frames

Convert a user space registration for processing multicast Action frames
(NL80211_CMD_REGISTER_FRAME with NL80211_ATTR_RECEIVE_MULTICAST) to a
new enum ieee80211_filter_flags bit FIF_MCAST_ACTION so that drivers can
update their RX filter parameters appropriately, if needed.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
Link: https://lore.kernel.org/r/20200421144815.19175-1-jouni@codeaurora.org
[rename variables to rx_mcast_action_reg indicating action frames only]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index f6dc5a3..f12fe3b 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1620,6 +1620,8 @@ enum ieee80211_vif_flags {
  *     monitor interface (if that is requested.)
  * @probe_req_reg: probe requests should be reported to mac80211 for this
  *     interface.
+ * @rx_mcast_action_reg: multicast Action frames should be reported to mac80211
+ *     for this interface.
  * @drv_priv: data area for driver use, will always be aligned to
  *     sizeof(void \*).
  * @txq: the multicast data TX queue (if driver uses the TXQ abstraction)
@@ -1648,6 +1650,7 @@ struct ieee80211_vif {
 #endif
 
        bool probe_req_reg;
+       bool rx_mcast_action_reg;
 
        bool txqs_stopped[IEEE80211_NUM_ACS];
 
@@ -3091,6 +3094,8 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
  * @FIF_PSPOLL: pass PS Poll frames
  *
  * @FIF_PROBE_REQ: pass probe request frames
+ *
+ * @FIF_MCAST_ACTION: pass multicast Action frames
  */
 enum ieee80211_filter_flags {
        FIF_ALLMULTI            = 1<<1,
@@ -3101,6 +3106,7 @@ enum ieee80211_filter_flags {
        FIF_OTHER_BSS           = 1<<6,
        FIF_PSPOLL              = 1<<7,
        FIF_PROBE_REQ           = 1<<8,
+       FIF_MCAST_ACTION        = 1<<9,
 };
 
 /**

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index e62b476..f0d43b9 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -3406,15 +3406,23 @@ ieee80211_update_mgmt_frame_registrations(struct wiphy *wiphy,
        struct ieee80211_local *local = wiphy_priv(wiphy);
        struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
        u32 preq_mask = BIT(IEEE80211_STYPE_PROBE_REQ >> 4);
+       u32 action_mask = BIT(IEEE80211_STYPE_ACTION >> 4);
        bool global_change, intf_change;
 
        global_change =
-               local->probe_req_reg != !!(upd->global_stypes & preq_mask);
+               (local->probe_req_reg != !!(upd->global_stypes & preq_mask)) ||
+               (local->rx_mcast_action_reg !=
+                !!(upd->global_mcast_stypes & action_mask));
        local->probe_req_reg = upd->global_stypes & preq_mask;
+       local->rx_mcast_action_reg = upd->global_mcast_stypes & action_mask;
 
-       intf_change = sdata->vif.probe_req_reg !=
-                               !!(upd->interface_stypes & preq_mask);
+       intf_change = (sdata->vif.probe_req_reg !=
+                      !!(upd->interface_stypes & preq_mask)) ||
+               (sdata->vif.rx_mcast_action_reg !=
+                !!(upd->interface_mcast_stypes & action_mask));
        sdata->vif.probe_req_reg = upd->interface_stypes & preq_mask;
+       sdata->vif.rx_mcast_action_reg =
+               upd->interface_mcast_stypes & action_mask;
 
        if (!local->open_count)
                return;

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index da41ee9..9407cf4 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1168,6 +1168,7 @@ struct ieee80211_local {
        int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
            fif_probe_req;
        bool probe_req_reg;
+       bool rx_mcast_action_reg;
        unsigned int filter_flags; /* FIF_* */
 
        bool wiphy_ciphers_allocated;

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 0e9ad60..a0cb052 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -64,6 +64,9 @@ void ieee80211_configure_filter(struct ieee80211_local *local)
        if (local->fif_pspoll)
                new_flags |= FIF_PSPOLL;
 
+       if (local->rx_mcast_action_reg)
+               new_flags |= FIF_MCAST_ACTION;
+
        spin_lock_bh(&local->filter_lock);
        changed_flags = local->filter_flags ^ new_flags;