]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: ath12k: pass tx arvif for MBSSID and EMA beacon generation
authorAloka Dixit <aloka.dixit@oss.qualcomm.com>
Mon, 10 Feb 2025 18:27:17 +0000 (10:27 -0800)
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>
Fri, 28 Feb 2025 19:53:13 +0000 (11:53 -0800)
Add new input parameter to ath12k_mac_setup_bcn_tmpl_ema() for
'tx_arvif' as the caller ath12k_mac_setup_bcn_tmpl() already
stores it locally. Avoid duplicate retrieval.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1

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-5-aloka.dixit@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
drivers/net/wireless/ath/ath12k/mac.c

index 2de9a9b003a62afb4f608587507e5abace200f3b..cdf40d68e43df8d0a0e0bed142ffb7d46f725c29 100644 (file)
@@ -1643,13 +1643,13 @@ static void ath12k_mac_set_arvif_ies(struct ath12k_link_vif *arvif, struct sk_bu
        }
 }
 
-static int ath12k_mac_setup_bcn_tmpl_ema(struct ath12k_link_vif *arvif)
+static int ath12k_mac_setup_bcn_tmpl_ema(struct ath12k_link_vif *arvif,
+                                        struct ath12k_link_vif *tx_arvif)
 {
        struct ath12k_vif *ahvif = arvif->ahvif;
        struct ieee80211_bss_conf *bss_conf;
        struct ath12k_wmi_bcn_tmpl_ema_arg ema_args;
        struct ieee80211_ema_beacons *beacons;
-       struct ath12k_link_vif *tx_arvif;
        bool nontx_profile_found = false;
        int ret = 0;
        u8 i;
@@ -1662,7 +1662,6 @@ static int ath12k_mac_setup_bcn_tmpl_ema(struct ath12k_link_vif *arvif)
                return -ENOLINK;
        }
 
-       tx_arvif = ath12k_mac_get_tx_arvif(arvif);
        beacons = ieee80211_beacon_get_template_ema_list(ath12k_ar_to_hw(tx_arvif->ar),
                                                         tx_arvif->ahvif->vif,
                                                         tx_arvif->link_id);
@@ -1731,7 +1730,7 @@ static int ath12k_mac_setup_bcn_tmpl(struct ath12k_link_vif *arvif)
                        return 0;
 
                if (link_conf->ema_ap)
-                       return ath12k_mac_setup_bcn_tmpl_ema(arvif);
+                       return ath12k_mac_setup_bcn_tmpl_ema(arvif, tx_arvif);
        } else {
                tx_arvif = arvif;
        }