wifi: mt76: mt7921: fix 6GHz regulatory update on connection

michaello316 · gregkh · commit 1e0f3e5e2835 · 2026-05-23T13:06:28.000+02:00
[ Upstream commit 3dc0c40 ] Call mt7921_regd_update() instead of mt7921_mcu_set_clc() when setting the 6GHz power type after connection, so that regulatory limits and SAR power are also applied. Fixes: 51ba0e3 ("wifi: mt76: mt7921: add 6GHz power type support for clc") Signed-off-by: Michael Lo <michael.lo@mediatek.com> Link: https://patch.msgid.link/20260211095025.2415624-1-leon.yen@mediatek.com Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -800,7 +800,8 @@ mt7921_regd_set_6ghz_power_type(struct ieee80211_vif *vif, bool is_add)
 	}
 
 out:
-	mt7921_mcu_set_clc(dev, dev->mt76.alpha2, dev->country_ie_env);
+	if (vif->bss_conf.chanreq.oper.chan->band == NL80211_BAND_6GHZ)
+		mt7921_regd_update(dev);
 }
 
 int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,

Original file line number	Diff line number	Diff line change
`@@ -800,7 +800,8 @@ mt7921_regd_set_6ghz_power_type(struct ieee80211_vif *vif, bool is_add)`
`800`	`800`	`}`
`801`	`801`
`802`	`802`	`out:`
`803`		`- mt7921_mcu_set_clc(dev, dev->mt76.alpha2, dev->country_ie_env);`
	`803`	`+ if (vif->bss_conf.chanreq.oper.chan->band == NL80211_BAND_6GHZ)`
	`804`	`+ mt7921_regd_update(dev);`
`804`	`805`	`}`
`805`	`806`
`806`	`807`	`int mt7921_mac_sta_add(struct mt76_dev mdev, struct ieee80211_vif vif,`