ath9k: add per-vif TX power capability to TX path

In order to add per-vif TX power capability cap per-packet TX power to vif
configured power if the latter is lower than per-rate TX power and mac80211
per-frame power. Use vif TX power if TPC has been disabled for current the
interface

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 1b8e75c4d2c2d6659b8901dd915b0209bfb928f7..0acd079ba96bd3d2f60602ebf5f889f36da9f908 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1103,14 +1103,28 @@ static u8 ath_get_rate_txpower(struct ath_softc *sc, struct ath_buf *bf,
        struct sk_buff *skb;
        struct ath_frame_info *fi;
        struct ieee80211_tx_info *info;
+       struct ieee80211_vif *vif;
        struct ath_hw *ah = sc->sc_ah;
 
        if (sc->tx99_state || !ah->tpc_enabled)
                return MAX_RATE_POWER;
 
        skb = bf->bf_mpdu;
-       fi = get_frame_info(skb);
        info = IEEE80211_SKB_CB(skb);
+       vif = info->control.vif;
+
+       if (!vif) {
+               max_power = sc->cur_chan->cur_txpower;
+               goto out;
+       }
+
+       if (vif->bss_conf.txpower_type != NL80211_TX_POWER_LIMITED) {
+               max_power = min_t(u8, sc->cur_chan->cur_txpower,
+                                 2 * vif->bss_conf.txpower);
+               goto out;
+       }
+
+       fi = get_frame_info(skb);
 
        if (!AR_SREV_9300_20_OR_LATER(ah)) {
                int txpower = fi->tx_power;
@@ -1147,25 +1161,25 @@ static u8 ath_get_rate_txpower(struct ath_softc *sc, struct ath_buf *bf,
                        txpower -= 2;
 
                txpower = max(txpower, 0);
-               max_power = min_t(u8, ah->tx_power[rateidx], txpower);
-
-               /* XXX: clamp minimum TX power at 1 for AR9160 since if
-                * max_power is set to 0, frames are transmitted at max
-                * TX power
-                */
-               if (!max_power && !AR_SREV_9280_20_OR_LATER(ah))
-                       max_power = 1;
+               max_power = min_t(u8, ah->tx_power[rateidx],
+                                 2 * vif->bss_conf.txpower);
+               max_power = min_t(u8, max_power, txpower);
        } else if (!bf->bf_state.bfs_paprd) {
                if (rateidx < 8 && (info->flags & IEEE80211_TX_CTL_STBC))
-                       max_power = min(ah->tx_power_stbc[rateidx],
-                                       fi->tx_power);
+                       max_power = min_t(u8, ah->tx_power_stbc[rateidx],
+                                         2 * vif->bss_conf.txpower);
                else
-                       max_power = min(ah->tx_power[rateidx], fi->tx_power);
+                       max_power = min_t(u8, ah->tx_power[rateidx],
+                                         2 * vif->bss_conf.txpower);
+               max_power = min(max_power, fi->tx_power);
        } else {
                max_power = ah->paprd_training_power;
        }
-
-       return max_power;
+out:
+       /* XXX: clamp minimum TX power at 1 for AR9160 since if max_power
+        * is set to 0, frames are transmitted at max TX power
+        */
+       return (!max_power && !AR_SREV_9280_20_OR_LATER(ah)) ? 1 : max_power;
 }
 
 static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,