]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: mt76: fix available_antennas setting
authorShayne Chen <shayne.chen@mediatek.com>
Thu, 15 May 2025 03:29:51 +0000 (11:29 +0800)
committerFelix Fietkau <nbd@nbd.name>
Thu, 22 May 2025 10:57:36 +0000 (12:57 +0200)
Check if available_antennas_tx and available_antennas_rx are already set
during the per-chip initialization phase; otherwise, they could be
overwritten with incorrect values.

Fixes: 69d54ce7491d ("wifi: mt76: mt7996: switch to single multi-radio wiphy")
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Link: https://patch.msgid.link/20250515032952.1653494-8-shayne.chen@mediatek.com
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mac80211.c

index b88d7e10742ee621d2cc6f17576592c6793f2f6c..e9605dc222910f9c2bdaa0e9112fbb7b538e902e 100644 (file)
@@ -449,8 +449,10 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw)
        wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_AIRTIME_FAIRNESS);
        wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_AQL);
 
-       wiphy->available_antennas_tx = phy->antenna_mask;
-       wiphy->available_antennas_rx = phy->antenna_mask;
+       if (!wiphy->available_antennas_tx)
+               wiphy->available_antennas_tx = phy->antenna_mask;
+       if (!wiphy->available_antennas_rx)
+               wiphy->available_antennas_rx = phy->antenna_mask;
 
        wiphy->sar_capa = &mt76_sar_capa;
        phy->frp = devm_kcalloc(dev->dev, wiphy->sar_capa->num_freq_ranges,