This is a note to let you know that I've just added the patch titled
wifi: mac80211: Fix setting txpower with emulate_chanctx
to the 6.11-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:
wifi-mac80211-fix-setting-txpower-with-emulate_chanc.patch
and it can be found in the queue-6.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit aee12a191a708cfcfe2573fa79aac46d996086d7
Author: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Date: Mon Sep 23 18:13:25 2024 -0700
wifi: mac80211: Fix setting txpower with emulate_chanctx
[ Upstream commit 8dd0498983eef524a8d104eb8abb32ec4c595bec ]
Propagate hw conf into the driver when txpower changes
and driver is emulating channel contexts.
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Link: https://patch.msgid.link/20240924011325.1509103-1-greearb@xxxxxxxxxxxxxxx
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index f2b5c18417ef7..6e35425fbff12 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -3046,6 +3046,7 @@ static int ieee80211_set_tx_power(struct wiphy *wiphy,
enum nl80211_tx_power_setting txp_type = type;
bool update_txp_type = false;
bool has_monitor = false;
+ int old_power = local->user_power_level;
lockdep_assert_wiphy(local->hw.wiphy);
@@ -3128,6 +3129,10 @@ static int ieee80211_set_tx_power(struct wiphy *wiphy,
}
}
+ if (local->emulate_chanctx &&
+ (old_power != local->user_power_level))
+ ieee80211_hw_conf_chan(local);
+
return 0;
}
