wifi: ath11k: refactor transmitted arvif retrieval

Create a new function ath11k_mac_get_tx_arvif() to retrieve 'arvif'
for the transmitted interface of the MBSSID set. This will help
modifying the same code path to reflect mac80211 data structure
changes to support MLO. This also fixes an issue in
ath11k_mac_update_vif_chan() where tx_arvif is not reset to NULL
inside for loop during each iteration. Compile tested only.

Signed-off-by: Aloka Dixit <aloka.dixit@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20250210182718.408891-2-aloka.dixit@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 14ed538365899387878817eb8674f4a76ac533bd..466a314b938b60a1179aea074d01c926e3ff8f80 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -1529,6 +1529,14 @@ static int ath11k_mac_set_vif_params(struct ath11k_vif *arvif,
        return ret;
 }
 
+static struct ath11k_vif *ath11k_mac_get_tx_arvif(struct ath11k_vif *arvif)
+{
+       if (arvif->vif->mbssid_tx_vif)
+               return ath11k_vif_to_arvif(arvif->vif->mbssid_tx_vif);
+
+       return NULL;
+}
+
 static int ath11k_mac_setup_bcn_tmpl_ema(struct ath11k_vif *arvif)
 {
        struct ath11k_vif *tx_arvif;
@@ -1538,7 +1546,7 @@ static int ath11k_mac_setup_bcn_tmpl_ema(struct ath11k_vif *arvif)
        u32 params = 0;
        u8 i = 0;
 
-       tx_arvif = ath11k_vif_to_arvif(arvif->vif->mbssid_tx_vif);
+       tx_arvif = ath11k_mac_get_tx_arvif(arvif);
 
        beacons = ieee80211_beacon_get_template_ema_list(tx_arvif->ar->hw,
                                                         tx_arvif->vif, 0);
@@ -1589,21 +1597,21 @@ static int ath11k_mac_setup_bcn_tmpl_mbssid(struct ath11k_vif *arvif)
 {
        struct ath11k *ar = arvif->ar;
        struct ath11k_base *ab = ar->ab;
-       struct ath11k_vif *tx_arvif = arvif;
+       struct ath11k_vif *tx_arvif;
        struct ieee80211_hw *hw = ar->hw;
        struct ieee80211_vif *vif = arvif->vif;
        struct ieee80211_mutable_offsets offs = {};
        struct sk_buff *bcn;
        int ret;
 
-       if (vif->mbssid_tx_vif) {
-               tx_arvif = ath11k_vif_to_arvif(vif->mbssid_tx_vif);
-               if (tx_arvif != arvif) {
-                       ar = tx_arvif->ar;
-                       ab = ar->ab;
-                       hw = ar->hw;
-                       vif = tx_arvif->vif;
-               }
+       tx_arvif = ath11k_mac_get_tx_arvif(arvif);
+       if (tx_arvif && tx_arvif != arvif) {
+               ar = tx_arvif->ar;
+               ab = ar->ab;
+               hw = ar->hw;
+               vif = tx_arvif->vif;
+       } else {
+               tx_arvif = arvif;
        }
 
        bcn = ieee80211_beacon_get_template(hw, vif, &offs, 0);
@@ -1674,7 +1682,7 @@ static void ath11k_control_beaconing(struct ath11k_vif *arvif,
                                     struct ieee80211_bss_conf *info)
 {
        struct ath11k *ar = arvif->ar;
-       struct ath11k_vif *tx_arvif = NULL;
+       struct ath11k_vif *tx_arvif;
        int ret = 0;
 
        lockdep_assert_held(&arvif->ar->conf_mutex);
@@ -1701,9 +1709,7 @@ static void ath11k_control_beaconing(struct ath11k_vif *arvif,
 
        ether_addr_copy(arvif->bssid, info->bssid);
 
-       if (arvif->vif->mbssid_tx_vif)
-               tx_arvif = ath11k_vif_to_arvif(arvif->vif->mbssid_tx_vif);
-
+       tx_arvif = ath11k_mac_get_tx_arvif(arvif);
        ret = ath11k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid,
                                 arvif->bssid,
                                 tx_arvif ? tx_arvif->bssid : NULL,
@@ -6385,23 +6391,20 @@ static int ath11k_mac_setup_vdev_params_mbssid(struct ath11k_vif *arvif,
 {
        struct ath11k *ar = arvif->ar;
        struct ath11k_vif *tx_arvif;
-       struct ieee80211_vif *tx_vif;
 
        *tx_vdev_id = 0;
-       tx_vif = arvif->vif->mbssid_tx_vif;
-       if (!tx_vif) {
+       tx_arvif = ath11k_mac_get_tx_arvif(arvif);
+       if (!tx_arvif) {
                *flags = WMI_HOST_VDEV_FLAGS_NON_MBSSID_AP;
                return 0;
        }
 
-       tx_arvif = ath11k_vif_to_arvif(tx_vif);
-
        if (arvif->vif->bss_conf.nontransmitted) {
-               if (ar->hw->wiphy != ieee80211_vif_to_wdev(tx_vif)->wiphy)
+               if (ar->hw->wiphy != tx_arvif->ar->hw->wiphy)
                        return -EINVAL;
 
                *flags = WMI_HOST_VDEV_FLAGS_NON_TRANSMIT_AP;
-               *tx_vdev_id = ath11k_vif_to_arvif(tx_vif)->vdev_id;
+               *tx_vdev_id = tx_arvif->vdev_id;
        } else if (tx_arvif == arvif) {
                *flags = WMI_HOST_VDEV_FLAGS_TRANSMIT_AP;
        } else {
@@ -7361,8 +7364,7 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,
                           int n_vifs)
 {
        struct ath11k_base *ab = ar->ab;
-       struct ath11k_vif *arvif, *tx_arvif = NULL;
-       struct ieee80211_vif *mbssid_tx_vif;
+       struct ath11k_vif *arvif, *tx_arvif;
        int ret;
        int i;
        bool monitor_vif = false;
@@ -7416,10 +7418,7 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,
                        ath11k_warn(ab, "failed to update bcn tmpl during csa: %d\n",
                                    ret);
 
-               mbssid_tx_vif = arvif->vif->mbssid_tx_vif;
-               if (mbssid_tx_vif)
-                       tx_arvif = ath11k_vif_to_arvif(mbssid_tx_vif);
-
+               tx_arvif = ath11k_mac_get_tx_arvif(arvif);
                ret = ath11k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid,
                                         arvif->bssid,
                                         tx_arvif ? tx_arvif->bssid : NULL,