From: Ben Greear Date: Thu, 10 Oct 2024 20:39:54 +0000 (-0700) Subject: mac80211: fix user-power when emulating chanctx X-Git-Tag: microblaze-v6.16~796^2~6^2~3 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=9b15c6cf8d2e82c8427cd06f535d8de93b5b995c;p=linux-2.6-microblaze.git mac80211: fix user-power when emulating chanctx 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 Link: https://patch.msgid.link/20241010203954.1219686-1-greearb@candelatech.com Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 89084690350f..ee1211a213d7 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -167,6 +167,8 @@ static u32 ieee80211_calc_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) {