[PATCH 14/65] staging: wfx: drop wdev->output_power

Jérôme Pouiller
2020-01-15T12:18:57Z

mac80211 and the device are both able to control tx power per vif. But,
the current code retrieve tx power from wfx_config(). So, it does not
allow to setup the tx power independently for each vif. Driver just has
to rely on bss_conf->txpower to get the correct information.

In add, it is no more necessary to protect access to wdev->output_power
with scan_lock.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
drivers/staging/wfx/scan.c | 4 ++--
drivers/staging/wfx/sta.c | 16 ++--------------
drivers/staging/wfx/wfx.h | 2 --
3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/wfx/scan.c b/drivers/staging/wfx/scan.c
index 8e0ac89fd28f..5cc9df5eb6a1 100644
--- a/drivers/staging/wfx/scan.c
+++ b/drivers/staging/wfx/scan.c
@@ -60,8 +60,8 @@ static int send_scan_req(struct wfx_vif *wvif,
if (timeout < 0)
return timeout;
ret = wait_for_completion_timeout(&wvif->scan_complete, timeout);
- if (req->channels[start_idx]->max_power != wvif->wdev->output_power)
- hif_set_output_power(wvif, wvif->wdev->output_power);
+ if (req->channels[start_idx]->max_power != wvif->vif->bss_conf.txpower)
+ hif_set_output_power(wvif, wvif->vif->bss_conf.txpower);
wfx_tx_unlock(wvif->wdev);
if (!ret) {
dev_notice(wvif->wdev->dev, "scan timeout\n");
diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index dd2d0422c9ca..a0f19d33e972 100644
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -503,7 +503,6 @@ static void wfx_do_unjoin(struct wfx_vif *wvif)
hif_keep_alive_period(wvif, 0);
hif_reset(wvif, false);
wfx_tx_policy_init(wvif);
- hif_set_output_power(wvif, wvif->wdev->output_power);
wvif->dtim_period = 0;
hif_set_macaddr(wvif, wvif->vif->addr);
wfx_free_event_queue(wvif);
@@ -990,11 +989,8 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw,
info->cqm_rssi_hyst);
}

- if (changed & BSS_CHANGED_TXPOWER &&
- info->txpower != wdev->output_power) {
- wdev->output_power = info->txpower;
- hif_set_output_power(wvif, wdev->output_power);
- }
+ if (changed & BSS_CHANGED_TXPOWER)
+ hif_set_output_power(wvif, info->txpower);
mutex_unlock(&wdev->conf_mutex);

if (do_join)
@@ -1232,7 +1228,6 @@ int wfx_config(struct ieee80211_hw *hw, u32 changed)
{
int ret = 0;
struct wfx_dev *wdev = hw->priv;
- struct ieee80211_conf *conf = &hw->conf;
struct wfx_vif *wvif;

// FIXME: Interface id should not been hardcoded
@@ -1242,13 +1237,7 @@ int wfx_config(struct ieee80211_hw *hw, u32 changed)
return 0;
}

- mutex_lock(&wvif->scan_lock);
mutex_lock(&wdev->conf_mutex);
- if (changed & IEEE80211_CONF_CHANGE_POWER) {
- wdev->output_power = conf->power_level;
- hif_set_output_power(wvif, wdev->output_power);
- }
-
if (changed & IEEE80211_CONF_CHANGE_PS) {
wvif = NULL;
while ((wvif = wvif_iterate(wdev, wvif)) != NULL)
@@ -1257,7 +1246,6 @@ int wfx_config(struct ieee80211_hw *hw, u32 changed)
}

mutex_unlock(&wdev->conf_mutex);
- mutex_unlock(&wvif->scan_lock);
return ret;
}

diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h
index ba6e0e923f4b..155dbe5704c9 100644
--- a/drivers/staging/wfx/wfx.h
+++ b/drivers/staging/wfx/wfx.h
@@ -59,8 +59,6 @@ struct wfx_dev {

struct hif_rx_stats rx_stats;
struct mutex rx_stats_lock;
-
- int output_power;
};

struct wfx_vif {
--
2.25.0