wifi: mac80211: refactor CSA queue block/unblock

This code is duplicated many times, refactor it into
new separate functions.

Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20240612143037.1ad22f10392d.If21490c2c67aae28f3c54038363181ee920ce3d1@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 3236477424b80fd47a2b528830cce04eb1bc594f..7eb2e5bedb6f11e7748de8c4248db4360499c36c 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1615,11 +1615,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev,
        /* abort any running channel switch or color change */
        link_conf->csa_active = false;
        link_conf->color_change_active = false;
-       if (sdata->csa_blocked_queues) {
-               ieee80211_wake_vif_queues(local, sdata,
-                                         IEEE80211_QUEUE_STOP_REASON_CSA);
-               sdata->csa_blocked_queues = false;
-       }
+       ieee80211_vif_unblock_queues_csa(sdata);
 
        ieee80211_free_next_beacon(link);
 
@@ -3757,11 +3753,7 @@ static int __ieee80211_csa_finalize(struct ieee80211_link_data *link_data)
 
        ieee80211_link_info_change_notify(sdata, link_data, changed);
 
-       if (sdata->csa_blocked_queues) {
-               ieee80211_wake_vif_queues(local, sdata,
-                                         IEEE80211_QUEUE_STOP_REASON_CSA);
-               sdata->csa_blocked_queues = false;
-       }
+       ieee80211_vif_unblock_queues_csa(sdata);
 
        err = drv_post_channel_switch(link_data);
        if (err)
@@ -4038,12 +4030,8 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
        link_data->csa.chanreq = chanreq;
        link_conf->csa_active = true;
 
-       if (params->block_tx &&
-           !ieee80211_hw_check(&local->hw, HANDLES_QUIET_CSA)) {
-               ieee80211_stop_vif_queues(local, sdata,
-                                         IEEE80211_QUEUE_STOP_REASON_CSA);
-               sdata->csa_blocked_queues = true;
-       }
+       if (params->block_tx)
+               ieee80211_vif_block_queues_csa(sdata);
 
        cfg80211_ch_switch_started_notify(sdata->dev,
                                          &link_data->csa.chanreq.oper, link_id,

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 3e735c9436d38427832733732fc0cea308a94a17..b482763e9f99c1a1067422ffb8fdc1fb9c48abde 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1823,6 +1823,9 @@ ieee80211_have_rx_timestamp(struct ieee80211_rx_status *status)
 void ieee80211_vif_inc_num_mcast(struct ieee80211_sub_if_data *sdata);
 void ieee80211_vif_dec_num_mcast(struct ieee80211_sub_if_data *sdata);
 
+void ieee80211_vif_block_queues_csa(struct ieee80211_sub_if_data *sdata);
+void ieee80211_vif_unblock_queues_csa(struct ieee80211_sub_if_data *sdata);
+
 /* This function returns the number of multicast stations connected to this
  * interface. It returns -1 if that number is not tracked, that is for netdevs
  * not in AP or AP_VLAN mode or when using 4addr.

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 6b7580c61e0c3abad6b2d1d324dbfaaac0ddf2fb..f06e165d6c7aa4b724ac95409923a50843e2a91b 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -544,11 +544,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_do
        sdata->vif.bss_conf.csa_active = false;
        if (sdata->vif.type == NL80211_IFTYPE_STATION)
                sdata->deflink.u.mgd.csa.waiting_bcn = false;
-       if (sdata->csa_blocked_queues) {
-               ieee80211_wake_vif_queues(local, sdata,
-                                         IEEE80211_QUEUE_STOP_REASON_CSA);
-               sdata->csa_blocked_queues = false;
-       }
+       ieee80211_vif_unblock_queues_csa(sdata);
 
        wiphy_work_cancel(local->hw.wiphy, &sdata->deflink.csa.finalize_work);
        wiphy_work_cancel(local->hw.wiphy,
@@ -2345,3 +2341,26 @@ void ieee80211_vif_dec_num_mcast(struct ieee80211_sub_if_data *sdata)
        else if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
                atomic_dec(&sdata->u.vlan.num_mcast_sta);
 }
+
+void ieee80211_vif_block_queues_csa(struct ieee80211_sub_if_data *sdata)
+{
+       struct ieee80211_local *local = sdata->local;
+
+       if (ieee80211_hw_check(&local->hw, HANDLES_QUIET_CSA))
+               return;
+
+       ieee80211_stop_vif_queues(local, sdata,
+                                 IEEE80211_QUEUE_STOP_REASON_CSA);
+       sdata->csa_blocked_queues = true;
+}
+
+void ieee80211_vif_unblock_queues_csa(struct ieee80211_sub_if_data *sdata)
+{
+       struct ieee80211_local *local = sdata->local;
+
+       if (sdata->csa_blocked_queues) {
+               ieee80211_wake_vif_queues(local, sdata,
+                                         IEEE80211_QUEUE_STOP_REASON_CSA);
+               sdata->csa_blocked_queues = false;
+       }
+}

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index ef3280fafbe994ab9736a52d3b79d8887e238dd1..ac376ec47a592b2cf835e3fa424f0aa64aa76f80 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2166,7 +2166,6 @@ static void ieee80211_csa_switch_work(struct wiphy *wiphy,
 static void ieee80211_chswitch_post_beacon(struct ieee80211_link_data *link)
 {
        struct ieee80211_sub_if_data *sdata = link->sdata;
-       struct ieee80211_local *local = sdata->local;
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        int ret;
 
@@ -2174,11 +2173,7 @@ static void ieee80211_chswitch_post_beacon(struct ieee80211_link_data *link)
 
        WARN_ON(!link->conf->csa_active);
 
-       if (sdata->csa_blocked_queues) {
-               ieee80211_wake_vif_queues(local, sdata,
-                                         IEEE80211_QUEUE_STOP_REASON_CSA);
-               sdata->csa_blocked_queues = false;
-       }
+       ieee80211_vif_unblock_queues_csa(sdata);
 
        link->conf->csa_active = false;
        link->u.mgd.csa.blocked_tx = false;
@@ -2242,11 +2237,7 @@ ieee80211_sta_abort_chanswitch(struct ieee80211_link_data *link)
 
        ieee80211_link_unreserve_chanctx(link);
 
-       if (sdata->csa_blocked_queues) {
-               ieee80211_wake_vif_queues(local, sdata,
-                                         IEEE80211_QUEUE_STOP_REASON_CSA);
-               sdata->csa_blocked_queues = false;
-       }
+       ieee80211_vif_unblock_queues_csa(sdata);
 
        link->conf->csa_active = false;
        link->u.mgd.csa.blocked_tx = false;
@@ -2571,12 +2562,8 @@ ieee80211_sta_process_chanswitch(struct ieee80211_link_data *link,
        link->u.mgd.beacon_crc_valid = false;
        link->u.mgd.csa.blocked_tx = csa_ie.mode;
 
-       if (csa_ie.mode &&
-           !ieee80211_hw_check(&local->hw, HANDLES_QUIET_CSA)) {
-               ieee80211_stop_vif_queues(local, sdata,
-                                         IEEE80211_QUEUE_STOP_REASON_CSA);
-               sdata->csa_blocked_queues = true;
-       }
+       if (csa_ie.mode)
+               ieee80211_vif_block_queues_csa(sdata);
 
        cfg80211_ch_switch_started_notify(sdata->dev, &csa_ie.chanreq.oper,
                                          link->link_id, csa_ie.count,
@@ -3670,11 +3657,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
        sdata->deflink.u.mgd.csa.blocked_tx = false;
        sdata->deflink.u.mgd.csa.waiting_bcn = false;
        sdata->deflink.u.mgd.csa.ignored_same_chan = false;
-       if (sdata->csa_blocked_queues) {
-               ieee80211_wake_vif_queues(local, sdata,
-                                         IEEE80211_QUEUE_STOP_REASON_CSA);
-               sdata->csa_blocked_queues = false;
-       }
+       ieee80211_vif_unblock_queues_csa(sdata);
 
        /* existing TX TSPEC sessions no longer exist */
        memset(ifmgd->tx_tspec, 0, sizeof(ifmgd->tx_tspec));
@@ -4045,11 +4028,7 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)
        sdata->vif.bss_conf.csa_active = false;
        sdata->deflink.u.mgd.csa.waiting_bcn = false;
        sdata->deflink.u.mgd.csa.blocked_tx = false;
-       if (sdata->csa_blocked_queues) {
-               ieee80211_wake_vif_queues(local, sdata,
-                                         IEEE80211_QUEUE_STOP_REASON_CSA);
-               sdata->csa_blocked_queues = false;
-       }
+       ieee80211_vif_unblock_queues_csa(sdata);
 
        ieee80211_report_disconnect(sdata, frame_buf, sizeof(frame_buf), tx,
                                    WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,