[PATCH 2/2] wifi: mt76: connac: correct rate power limit logic
From: Shiji Yang
Date: Thu Nov 19 2026 - 23:42:02 EST
When mac80211 sets the power to 0, it does not make sense to change
the tx power to the maximum value. The original purpose should be to
limit the tx power to not exceed the hardware limit.
Fixes: 8225816d2974 ("mt76: mt7921: limit txpower according to userlevel power")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Shiji Yang <yangshiji66@xxxxxxxxxxx>
---
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 2ac3b757942e..931dc550c47e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -3035,12 +3035,9 @@ s8 mt76_connac_get_rate_power_limit(struct mt76_phy *phy,
struct mt76_power_limits *limits)
{
s8 reg_power, sar_power;
- int tx_power;
-
- tx_power = 2 * phy->hw->conf.power_level;
- if (!tx_power)
- tx_power = 127;
+ int tx_power = phy->hw->conf.power_level * 2;
+ tx_power = min_t(int, tx_power, is_connac2(phy->dev) ? 127 : 63);
reg_power = mt76_connac_get_ch_power(phy, chan, tx_power);
sar_power = mt76_get_sar_power(phy, chan, reg_power);
return mt76_get_rate_power_limits(phy, chan, limits, sar_power);
--
2.53.0