wl12xx: add power_level field to wlvif

move power_level into the per-interface data.

mac80211 configures some values (e.g. band, channel)
globally, while we configure them per-interface.

In order to make it easier to keep track of the
configured value for each value while keeping sync
with mac80211, save these values both globally
and per-vif.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

3 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c
index 4af7e2fb52fd..74f569099b53 100644
--- a/drivers/net/wireless/wl12xx/init.c
+++ b/drivers/net/wireless/wl12xx/init.c
@@ -554,7 +554,7 @@ static int wl12xx_init_ap_role(struct wl1271 *wl, struct wl12xx_vif *wlvif)
                 return ret;
 
         /* initialize Tx power */
-        ret = wl1271_acx_tx_power(wl, wlvif, wl->power_level);
+        ret = wl1271_acx_tx_power(wl, wlvif, wlvif->power_level);
         if (ret < 0)
                 return ret;
 
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 5137275d3591..cffb40be7b5b 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1974,6 +1974,7 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
          */
         wlvif->band = wl->band;
         wlvif->channel = wl->channel;
+        wlvif->power_level = wl->power_level;
 
         INIT_WORK(&wlvif->rx_streaming_enable_work,
                   wl1271_rx_streaming_enable_work);
@@ -2562,12 +2563,13 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
                                                  wlvif->basic_rate, true);
         }
 
-        if (conf->power_level != wl->power_level) {
+        if (conf->power_level != wlvif->power_level) {
                 ret = wl1271_acx_tx_power(wl, wlvif, conf->power_level);
                 if (ret < 0)
                         goto out_sleep;
 
                 wl->power_level = conf->power_level;
+                wlvif->power_level = conf->power_level;
         }
 
 out_sleep:
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 02dedd191bd4..2689522ba4ed 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -631,6 +631,9 @@ struct wl12xx_vif {
         /* retry counter for PSM entries */
         u8 psm_entry_retry;
 
+        /* in dBm */
+        int power_level;
+
         int rssi_thold;
         int last_rssi_event;