From: Ben Greear Date: Tue, 24 Sep 2024 01:13:25 +0000 (-0700) Subject: wifi: mac80211: Fix setting txpower with emulate_chanctx X-Git-Tag: v6.12-rc6~33^2~24^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8dd0498983eef524a8d104eb8abb32ec4c595bec;p=thirdparty%2Flinux.git wifi: mac80211: Fix setting txpower with emulate_chanctx Propagate hw conf into the driver when txpower changes and driver is emulating channel contexts. Signed-off-by: Ben Greear Link: https://patch.msgid.link/20240924011325.1509103-1-greearb@candelatech.com Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 847304a3a29a9..7cefe763b7720 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; }