mac80211: fix user-power when emulating chanctx

[ 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@candelatech.com>
Link: https://patch.msgid.link/20241010203954.1219686-1-greearb@candelatech.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index ae90ac3be59aadcba9f30d53b081b94e92116772..8b3eead8989ddfe1cc1212b8a952d604ab7374b3 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -144,6 +144,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) {