mac80211: fix user-power when emulating chanctx

greearb · jmberg-intel · commit 9b15c6cf8d2e · 2024-10-25T17:53:38.000+02:00
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>
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,8 @@ static u32 ieee80211_calc_hw_conf_chan(struct ieee80211_local *local,`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`power = ieee80211_chandef_max_power(&chandef);`
	`170`	`+ if (local->user_power_level != IEEE80211_UNSET_POWER_LEVEL)`
	`171`	`+ power = min(local->user_power_level, power);`
`170`	`172`
`171`	`173`	`rcu_read_lock();`
`172`	`174`	`list_for_each_entry_rcu(sdata, &local->interfaces, list) {`