mac80211: Fix setting txpower to zero.
Subsystems (3)
PATCH v2 1/1 mac80211: Fix setting txpower to zero.
From: Ben Greear <[email protected]>
With multiple VIFS ath10k, and probably others, tries to find the minimum txpower for all vifs and uses that when setting txpower in the firmware.
If a second vif is added and starts to scan, it's txpower is not initialized yet and it set to zero.
ath10k had a patch to ignore zero values, but then it is impossible to actually set txpower to zero.
So, instead initialize the txpower to -1 in mac80211, and let drivers know that means the power has not been set and so should be ignored.
This should fix regression in:
commit 88407beb1b1462f706a1950a355fd086e1c450b6
Author: Ryan Hsu <[email protected]> Date: Tue Dec 13 14:55:19 2016 -0800
ath10k: fix incorrect txpower set by P2P_DEVICE interface
Tested on ath10k 9984 with ath10k-ct firmware.
---
v2: Use INT_MIN instead of -1 to mean invalid value
drivers/net/wireless/ath/ath10k/mac.c | 3 ++- drivers/net/wireless/ath/ath9k/main.c | 3 +++ drivers/net/wireless/ath/ath9k/xmit.c | 7 +++++-- include/net/mac80211.h | 2 +- net/mac80211/iface.c | 1 + net/mac80211/main.c | 2 ++ 6 files changed, 14 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/mac.c +2 -1
@@ -5103,7 +5103,8 @@ static int ath10k_mac_txpower_recalc(struct ath10k *ar)lockdep_assert_held (&ar->conf_mutex);list_for_each_entry (arvif, &ar->arvifs, list) { -if (arvif->txpower <=0 ) +/* txpower not initialized yet? */ +if (arvif->txpower ==INT_MIN )continue ;if (txpower ==-1 )
drivers/net/wireless/ath/ath9k/main.c +3 -0
@@ -1196,6 +1196,9 @@ static void ath9k_tpc_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif) {int *power = data; +if (vif->bss_conf.txpower ==INT_MIN ) +return ; +if (*power < vif->bss_conf.txpower) *power = vif->bss_conf.txpower; }
drivers/net/wireless/ath/ath9k/xmit.c +5 -2
@@ -2095,10 +2095,13 @@ static void setup_frame_info(struct ieee80211_hw *hw,if (tx_info->control.vif) {struct ieee80211_vif *vif = tx_info->control.vif; - +if (vif->bss_conf.txpower ==INT_MIN ) + goto nonvifpower; txpower =2 * vif->bss_conf.txpower; }else { -struct ath_softc *sc = hw->priv; +struct ath_softc *sc; + nonvifpower: + sc = hw->priv; txpower = sc->cur_chan->cur_txpower; }
include/net/mac80211.h +1 -1
@@ -573,7 +573,7 @@ struct ieee80211_ftm_responder_params {* @ssid: The SSID of the current vif. Valid in AP and IBSS mode. * @ssid_len: Length of SSID given in @ssid. * @hidden_ssid: The SSID of the current vif is hidden. Only valid in AP-mode. -* @txpower: TX power in dBm +* @txpower: TX power in dBm. INT_MIN means not configured. * @txpower_type: TX power adjustment used to control per packet Transmit * Power Control (TPC) in lower driver for the current vif. In particular * TPC is enabled if value passed in %txpower_type is
net/mac80211/iface.c +1 -0
@@ -1402,6 +1402,7 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata, sdata->control_port_no_encrypt = false; sdata->encrypt_headroom =IEEE80211_ENCRYPT_HEADROOM ; sdata->vif.bss_conf.idle = true; + sdata->vif.bss_conf.txpower =INT_MIN ;/* unset */ sdata->noack_map =0 ;
net/mac80211/main.c +2 -0
@@ -146,6 +146,8 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local)continue ;if (sdata->vif.type ==NL80211_IFTYPE_AP_VLAN )continue ; +if (sdata->vif.bss_conf.txpower ==INT_MIN ) +continue ; power =min (power, sdata->vif.bss_conf.txpower); }rcu_read_unlock ();
Signature · 1 line
2.20.1
Johannes Berg
maintainerQuoted 4 lines · On Tue, 2019-12-17 at 10:30 -0800, [email protected] wrote:
drivers/net/wireless/ath/ath10k/mac.c | 3 ++- drivers/net/wireless/ath/ath9k/main.c | 3 +++ drivers/net/wireless/ath/ath9k/xmit.c | 7 +++++--
All these driver changes worry me a bit - wouldn't that affect other drivers as well?
johannes
Quoted 11 lines · Johannes Berg
Quoted 4 lines · On Tue, 2019-12-17 at 10:30 -0800, [email protected] wrote:
drivers/net/wireless/ath/ath10k/mac.c | 3 ++- drivers/net/wireless/ath/ath9k/main.c | 3 +++ drivers/net/wireless/ath/ath9k/xmit.c | 7 +++++--All these driver changes worry me a bit - wouldn't that affect other drivers as well?
johannes
The goal was to NOT adversely affect the drivers when the default (not-set) value changed.
I changed the name of the variable and then touched every driver that used it as a way of making sure that I found everything in the tree.
Hopefully that found everything... I did not specifically test ath9k, only ath10k driver with this change.
(I then changed the variable name back before submitting the patch).
Thanks,
Ben
Signature · 2 lines
Ben Greear <[email protected]> Candela Technologies Inc http://www.candelatech.com
Johannes Berg
maintainerQuoted 11 lines · Ben Greear
Quoted 7 lines · Johannes Berg
Quoted 3 lines · On Tue, 2019-12-17 at 10:30 -0800, [email protected] wrote:
drivers/net/wireless/ath/ath10k/mac.c | 3 ++- drivers/net/wireless/ath/ath9k/main.c | 3 +++ drivers/net/wireless/ath/ath9k/xmit.c | 7 +++++--All these driver changes worry me a bit - wouldn't that affect other drivers as well?
The goal was to NOT adversely affect the drivers when the default (not-set) value changed.
Right.
Quoted 7 lines
I changed the name of the variable and then touched every driver that used it as a way of making sure that I found everything in the tree.
Hopefully that found everything... I did not specifically test ath9k, only ath10k driver with this change.
(I then changed the variable name back before submitting the patch).
OK, great, thanks :)
johannes
Quoted 18 lines · Johannes Berg
Quoted 11 lines · Ben Greear
Quoted 7 lines · Johannes Berg
Quoted 3 lines · On Tue, 2019-12-17 at 10:30 -0800, [email protected] wrote:
drivers/net/wireless/ath/ath10k/mac.c | 3 ++- drivers/net/wireless/ath/ath9k/main.c | 3 +++ drivers/net/wireless/ath/ath9k/xmit.c | 7 +++++--All these driver changes worry me a bit - wouldn't that affect other drivers as well?
The goal was to NOT adversely affect the drivers when the default (not-set) value changed.
Right.
Quoted 3 lines
I changed the name of the variable and then touched every driver that used it as a way of making sure that I found everything in the tree.
Quoted 6 lines
Quoted 4 lines
Hopefully that found everything... I did not specifically test ath9k, only ath10k driver with this change.
(I then changed the variable name back before submitting the patch).
OK, great, thanks :)
Come to think of it, I did not do an 'all mod config' build, so possibly I missed some things. I think my kernel compiles most of the drivers though.
Thanks,
Ben
Signature · 2 lines
Ben Greear <[email protected]> Candela Technologies Inc http://www.candelatech.com