wifi: mac80211: add support to call csa_finish on a link

Currently ieee80211_csa_finish() function finalizes CSA by scheduling a
finalizing worker using the deflink. With MLO, there is a need to do it
on a given link basis.

Pass link ID of the link on which CSA needs to be finalized.

Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
Link: https://msgid.link/20240130140918.1172387-6-quic_adisi@quicinc.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index b802204061044616d99c44f41b6418e824afe22b..41053219ee957b5d6211878770447e364804727e 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -2047,7 +2047,7 @@ static void ath10k_mac_vif_ap_csa_count_down(struct ath10k_vif *arvif)
                        ath10k_warn(ar, "failed to update prb tmpl during csa: %d\n",
                                    ret);
        } else {
-               ieee80211_csa_finish(vif);
+               ieee80211_csa_finish(vif, 0);
        }
 }
 

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 9e2f0a50aaea5d605d9eea1f3a3f715bfe8f30f6..ddf15717d5046ce324b643deffbee33c177bc3b5 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -3885,7 +3885,7 @@ void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb)
                 */
                if (arvif->vif->bss_conf.csa_active &&
                    ieee80211_beacon_cntdwn_is_complete(arvif->vif)) {
-                       ieee80211_csa_finish(arvif->vif);
+                       ieee80211_csa_finish(arvif->vif, 0);
                        continue;
                }
 

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 688ee20528a05d4f6955d2a4ccb62acbf0115c0c..3c9f3b0bcfaa91185af4e49a0a1315a341be6973 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -8226,7 +8226,7 @@ ath11k_wmi_process_csa_switch_count_event(struct ath11k_base *ab,
                }
 
                if (arvif->is_up && arvif->vif->bss_conf.csa_active)
-                       ieee80211_csa_finish(arvif->vif);
+                       ieee80211_csa_finish(arvif->vif, 0);
        }
        rcu_read_unlock();
 }

diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
index 2fa724e5851a90f767dc7ed8d3e48698cb60fbcb..75c3a0d9b9ecc0ebd1c37413f6cac8dd370f220d 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.c
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
@@ -6448,7 +6448,7 @@ ath12k_wmi_process_csa_switch_count_event(struct ath12k_base *ab,
                }
 
                if (arvif->is_up && arvif->vif->bss_conf.csa_active)
-                       ieee80211_csa_finish(arvif->vif);
+                       ieee80211_csa_finish(arvif->vif, 0);
        }
        rcu_read_unlock();
 }

diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index ee72faac2f1d06b3040f624e4e0077cb1f3e0ad0..4e48407138b25f8afb92e252680eee165e509894 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -368,7 +368,7 @@ bool ath9k_csa_is_finished(struct ath_softc *sc, struct ieee80211_vif *vif)
        if (!ieee80211_beacon_cntdwn_is_complete(vif))
                return false;
 
-       ieee80211_csa_finish(vif);
+       ieee80211_csa_finish(vif, 0);
        return true;
 }
 

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index 533471e694007e32f07396c5e23b28ad52e7e64f..8179d35dc310101c3346e15801f42b507922783c 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -517,7 +517,7 @@ bool ath9k_htc_csa_is_finished(struct ath9k_htc_priv *priv)
        if (!ieee80211_beacon_cntdwn_is_complete(vif))
                return false;
 
-       ieee80211_csa_finish(vif);
+       ieee80211_csa_finish(vif, 0);
 
        priv->csa_vif = NULL;
        return true;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index 3dea06b28472f4db0d88781a43ccc31098a01c4c..7cb6bc97b26c4ca7461cdc420f5196bdf1d4f3e4 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -1486,7 +1486,7 @@ static void iwl_mvm_csa_count_down(struct iwl_mvm *mvm,
                }
        } else if (!iwl_mvm_te_scheduled(&mvmvif->time_event_data)) {
                /* we don't have CSA NoA scheduled yet, switch now */
-               ieee80211_csa_finish(csa_vif);
+               ieee80211_csa_finish(csa_vif, 0);
                RCU_INIT_POINTER(mvm->csa_vif, NULL);
        }
 }
@@ -1836,7 +1836,7 @@ void iwl_mvm_channel_switch_start_notif(struct iwl_mvm *mvm,
                                      msecs_to_jiffies(IWL_MVM_CS_UNBLOCK_TX_TIMEOUT *
                                                       csa_vif->bss_conf.beacon_int));
 
-               ieee80211_csa_finish(csa_vif);
+               ieee80211_csa_finish(csa_vif, 0);
 
                rcu_read_unlock();
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
index 60ec5ca6927cdff94fc00c42411a2e0ba0b195fc..b7461bc325277f36eb4bde643c31f26fba60a6e0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
@@ -168,7 +168,7 @@ static void iwl_mvm_csa_noa_start(struct iwl_mvm *mvm)
                goto out_unlock;
        }
 
-       ieee80211_csa_finish(csa_vif);
+       ieee80211_csa_finish(csa_vif, 0);
 
        rcu_read_unlock();
 

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 8a3a90d1bfac58f7436d41f86eff8ba99f88475d..8bf82755ca4c647245fb4a92319be9fe3fdde8c3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -1614,7 +1614,7 @@ static void
 __mt76_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
 {
        if (vif->bss_conf.csa_active && ieee80211_beacon_cntdwn_is_complete(vif))
-               ieee80211_csa_finish(vif);
+               ieee80211_csa_finish(vif, 0);
 }
 
 void mt76_csa_finish(struct mt76_dev *dev)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index ae34d019e58838a53b5a8ad021b657def8a81bfd..c807bd8d928d64a69ed8ff5629bdb15de31aa462 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -353,7 +353,7 @@ static void
 mt7615_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
 {
        if (vif->bss_conf.csa_active)
-               ieee80211_csa_finish(vif);
+               ieee80211_csa_finish(vif, 0);
 }
 
 static void

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index df1ad6d4e12d9de8681f1f2bdacde6cc924f65ac..d90f98c5003994735d2dcb201acbde9bb4bd6a95 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -228,7 +228,7 @@ mt7915_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
        if (!vif->bss_conf.csa_active || vif->type == NL80211_IFTYPE_STATION)
                return;
 
-       ieee80211_csa_finish(vif);
+       ieee80211_csa_finish(vif, 0);
 }
 
 static void

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index 699be57309c2e4db6d8ff3f456d55fe5a75be291..3ec813077dc24b52402c4060ae62d29a7f0745e9 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -341,7 +341,7 @@ mt7996_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
        if (!vif->bss_conf.csa_active || vif->type == NL80211_IFTYPE_STATION)
                return;
 
-       ieee80211_csa_finish(vif);
+       ieee80211_csa_finish(vif, 0);
 }
 
 static void

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index b0c1db726d7abd1f2225325b8b6dd7f433c28e48..66bf92c164c30325fd78da7d420e675ac251cb57 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -5740,7 +5740,7 @@ static void rtl8xxxu_update_beacon_work_callback(struct work_struct *work)
 
        if (vif->bss_conf.csa_active) {
                if (ieee80211_beacon_cntdwn_is_complete(vif)) {
-                       ieee80211_csa_finish(vif);
+                       ieee80211_csa_finish(vif, 0);
                        return;
                }
                schedule_delayed_work(&priv->update_beacon_work,

diff --git a/drivers/net/wireless/ti/wlcore/event.c b/drivers/net/wireless/ti/wlcore/event.c
index 1e082d039b8224e694396adb0db71567bf711627..2499dc90830511bdeb0806dfca3c8ef6fdf3d197 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/event.c
+++ b/drivers/net/wireless/ti/wlcore/event.c
@@ -233,7 +233,7 @@ void wlcore_event_channel_switch(struct wl1271 *wl,
                        cancel_delayed_work(&wlvif->channel_switch_work);
                } else {
                        set_bit(WLVIF_FLAG_BEACON_DISABLED, &wlvif->flags);
-                       ieee80211_csa_finish(vif);
+                       ieee80211_csa_finish(vif, 0);
                }
        }
 }

diff --git a/drivers/net/wireless/virtual/mac80211_hwsim.c b/drivers/net/wireless/virtual/mac80211_hwsim.c
index 907c0842fee71b6cad7255e421e12b6301876fb9..c337afd8bee22bd55306d259c47d25332483ca17 100644 (file)
--- a/drivers/net/wireless/virtual/mac80211_hwsim.c
+++ b/drivers/net/wireless/virtual/mac80211_hwsim.c
@@ -2303,7 +2303,7 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,
        }
 
        if (link_conf->csa_active && ieee80211_beacon_cntdwn_is_complete(vif))
-               ieee80211_csa_finish(vif);
+               ieee80211_csa_finish(vif, link_id);
 }
 
 static enum hrtimer_restart

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 8acee7ce3aa9cb2f151e2da444e66c0070d8591d..45d905b17a65cd34917ea49db2bbc8c5ce6b6aa8 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -5555,12 +5555,13 @@ void ieee80211_beacon_set_cntdwn(struct ieee80211_vif *vif, u8 counter);
 /**
  * ieee80211_csa_finish - notify mac80211 about channel switch
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
+ * @link_id: valid link_id during MLO or 0 for non-MLO
  *
  * After a channel switch announcement was scheduled and the counter in this
  * announcement hits 1, this function must be called by the driver to
  * notify mac80211 that the channel can be changed.
  */
-void ieee80211_csa_finish(struct ieee80211_vif *vif);
+void ieee80211_csa_finish(struct ieee80211_vif *vif, unsigned int link_id);
 
 /**
  * ieee80211_beacon_cntdwn_is_complete - find out if countdown reached 1

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index d30a64cf95cd48388483e8573509876a2388ff37..156a4215dcda7f89cff8ae566394868a6a11eba3 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -3547,13 +3547,24 @@ cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon)
        return new_beacon;
 }
 
-void ieee80211_csa_finish(struct ieee80211_vif *vif)
+void ieee80211_csa_finish(struct ieee80211_vif *vif, unsigned int link_id)
 {
        struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
        struct ieee80211_local *local = sdata->local;
+       struct ieee80211_link_data *link_data;
+
+       if (WARN_ON(link_id >= IEEE80211_MLD_MAX_NUM_LINKS))
+               return;
 
        rcu_read_lock();
 
+       link_data = rcu_dereference(sdata->link[link_id]);
+       if (WARN_ON(!link_data)) {
+               rcu_read_unlock();
+               return;
+       }
+
+       /* TODO: MBSSID with MLO changes */
        if (vif->mbssid_tx_vif == vif) {
                /* Trigger ieee80211_csa_finish() on the non-transmitting
                 * interfaces when channel switch is received on
@@ -3572,7 +3583,7 @@ void ieee80211_csa_finish(struct ieee80211_vif *vif)
                                         &iter->deflink.csa_finalize_work);
                }
        }
-       wiphy_work_queue(local->hw.wiphy, &sdata->deflink.csa_finalize_work);
+       wiphy_work_queue(local->hw.wiphy, &link_data->csa_finalize_work);
 
        rcu_read_unlock();
 }