This is a note to let you know that I've just added the patch titled
mac80211: fix user-power when emulating chanctx
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mac80211-fix-user-power-when-emulating-chanctx.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 75f28d3f560c536a2a0f38bd339df44a376ab436
Author: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Date: Thu Oct 10 13:39:54 2024 -0700
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@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>
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) {
