[PATCH AUTOSEL 5.4 2/6] mac80211: fix user-power when emulating chanctx
From: Sasha Levin
Date: Mon Nov 04 2024 - 06:10:57 EST
From: Ben Greear <greearb@xxxxxxxxxxxxxxx>
[ Upstream commit 9b15c6cf8d2e82c8427cd06f535d8de93b5b995c ]
ieee80211_calc_hw_conf_chan was ignoring the configured
user_txpower. If it is set, use it to potentially decrease
txpower as requested.
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Link: https://patch.msgid.link/20241010203954.1219686-1-greearb@xxxxxxxxxxxxxxx
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
net/mac80211/main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index fa2ac02063cf4..266250e9f0330 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -139,6 +139,8 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local)
}
power = ieee80211_chandef_max_power(&chandef);
+ if (local->user_power_level != IEEE80211_UNSET_POWER_LEVEL)
+ power = min(local->user_power_level, power);
rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
--
2.43.0