ath9k: add support for the new rate control API

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 16 insertions, 7 deletions

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 108fe5fc1eaa..eab0fcb7ded6 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -157,6 +157,13 @@ static void ath_send_bar(struct ath_atx_tid *tid, u16 seqno)
                            seqno << IEEE80211_SEQ_SEQ_SHIFT);
 }
 
+static void ath_set_rates(struct ieee80211_vif *vif, struct ieee80211_sta *sta,
+                          struct ath_buf *bf)
+{
+        ieee80211_get_tx_rates(vif, sta, bf->bf_mpdu, bf->rates,
+                               ARRAY_SIZE(bf->rates));
+}
+
 static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
 {
         struct ath_txq *txq = tid->ac->txq;
@@ -189,6 +196,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
                         ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
                         sendbar = true;
                 } else {
+                        ath_set_rates(tid->an->vif, tid->an->sta, bf);
                         ath_tx_send_normal(sc, txq, NULL, skb);
                 }
         }
@@ -407,7 +415,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 
         tx_info = IEEE80211_SKB_CB(skb);
 
-        memcpy(rates, tx_info->control.rates, sizeof(rates));
+        memcpy(rates, bf->rates, sizeof(rates));
 
         retries = ts->ts_longretry + 1;
         for (i = 0; i < ts->ts_rateindex; i++)
@@ -736,8 +744,6 @@ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid,
                                   bool first_subfrm)
 {
 #define FIRST_DESC_NDELIMS 60
-        struct sk_buff *skb = bf->bf_mpdu;
-        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         u32 nsymbits, nsymbols;
         u16 minlen;
         u8 flags, rix;
@@ -778,8 +784,8 @@ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid,
         if (tid->an->mpdudensity == 0)
                 return ndelim;
 
-        rix = tx_info->control.rates[0].idx;
-        flags = tx_info->control.rates[0].flags;
+        rix = bf->rates[0].idx;
+        flags = bf->rates[0].flags;
         width = (flags & IEEE80211_TX_RC_40_MHZ_WIDTH) ? 1 : 0;
         half_gi = (flags & IEEE80211_TX_RC_SHORT_GI) ? 1 : 0;
 
@@ -858,6 +864,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
                         bf_first = bf;
 
                 if (!rl) {
+                        ath_set_rates(tid->an->vif, tid->an->sta, bf);
                         aggr_limit = ath_lookup_rate(sc, bf, tid);
                         rl = 1;
                 }
@@ -998,14 +1005,14 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,
 
         skb = bf->bf_mpdu;
         tx_info = IEEE80211_SKB_CB(skb);
-        rates = tx_info->control.rates;
+        rates = bf->rates;
         hdr = (struct ieee80211_hdr *)skb->data;
 
         /* set dur_update_en for l-sig computation except for PS-Poll frames */
         info->dur_update = !ieee80211_is_pspoll(hdr->frame_control);
         info->rtscts_rate = fi->rtscts_rate;
 
-        for (i = 0; i < 4; i++) {
+        for (i = 0; i < ARRAY_SIZE(bf->rates); i++) {
                 bool is_40, is_sgi, is_sp;
                 int phy;
 
@@ -1743,6 +1750,7 @@ static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid,
                 return;
         }
 
+        ath_set_rates(tid->an->vif, tid->an->sta, bf);
         bf->bf_state.bf_type = BUF_AMPDU;
         INIT_LIST_HEAD(&bf_head);
         list_add(&bf->list, &bf_head);
@@ -1993,6 +2001,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
         if (txctl->paprd)
                 bf->bf_state.bfs_paprd_timestamp = jiffies;
 
+        ath_set_rates(vif, sta, bf);
         ath_tx_send_normal(sc, txctl->txq, tid, skb);
 
 out: