ath9k: fix rate control tx status handling for A-MPDU

Currently the rate control tx status update gets called for every
subframe of an A-MPDU, and ath9k marks the frame with the relevant
status update with an internal flag. This not suitable for rate control
algorithms using the standard mac80211 rate control API, so fix this by
using IEEE80211_TX_STAT_AMPDU for marking the correct frames that
should be processed.

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

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 0e79e58cf4c..3c4b5d2d9e1 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -1226,8 +1226,12 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband,
                 long_retry = rate->count - 1;
         }
 
-        if (!priv_sta || !ieee80211_is_data(fc) ||
-            !(tx_info->pad[0] & ATH_TX_INFO_UPDATE_RC))
+        if (!priv_sta || !ieee80211_is_data(fc))
+                return;
+
+        /* This packet was aggregated but doesn't carry status info */
+        if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) &&
+            !(tx_info->flags & IEEE80211_TX_STAT_AMPDU))
                 return;
 
         if (tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED)