wifi: mac80211: add an option to filter a sta from being flushed

Sometimes we might want to flush only part of the stations of a vif,
for example only the TDLS ones.
To allow this, add a do_not_flush_sta argument to __sta_info_flush,
which in turn, will not flush this station.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241224192322.535e1fcca192.Icecf7f443bf98c9535ce8ec03b24d0d17dfbc28e@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index b8495d5..cc6983b 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1671,7 +1671,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev,
        link_conf->ema_ap = false;
        link_conf->bssid_indicator = 0;
 
-       __sta_info_flush(sdata, true, link_id);
+       __sta_info_flush(sdata, true, link_id, NULL);
 
        ieee80211_remove_link_keys(link, &keys);
        if (!list_empty(&keys)) {

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index aa22f09..82c278f 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -1567,7 +1567,7 @@ void sta_info_stop(struct ieee80211_local *local)
 
 
 int __sta_info_flush(struct ieee80211_sub_if_data *sdata, bool vlans,
-                    int link_id)
+                    int link_id, struct sta_info *do_not_flush_sta)
 {
        struct ieee80211_local *local = sdata->local;
        struct sta_info *sta, *tmp;
@@ -1585,6 +1585,9 @@ int __sta_info_flush(struct ieee80211_sub_if_data *sdata, bool vlans,
                    (!vlans || sdata->bss != sta->sdata->bss))
                        continue;
 
+               if (sta == do_not_flush_sta)
+                       continue;
+
                if (link_id >= 0 && sta->sta.valid_links &&
                    !(sta->sta.valid_links & BIT(link_id)))
                        continue;

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 9f89fb5..d4673e7 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -899,9 +899,10 @@ void sta_info_stop(struct ieee80211_local *local);
  * @link_id: if given (>=0), all those STA entries using @link_id only
  *          will be removed. If -1 is passed, all STA entries will be
  *          removed.
+ * @do_not_flush_sta: a station that shouldn't be flushed.
  */
 int __sta_info_flush(struct ieee80211_sub_if_data *sdata, bool vlans,
-                    int link_id);
+                    int link_id, struct sta_info *do_not_flush_sta);
 
 /**
  * sta_info_flush - flush matching STA entries from the STA table
@@ -916,7 +917,7 @@ int __sta_info_flush(struct ieee80211_sub_if_data *sdata, bool vlans,
 static inline int sta_info_flush(struct ieee80211_sub_if_data *sdata,
                                 int link_id)
 {
-       return __sta_info_flush(sdata, false, link_id);
+       return __sta_info_flush(sdata, false, link_id, NULL);
 }
 
 void sta_set_rate_info_tx(struct sta_info *sta,