1 files changed, 7 insertions, 1 deletions

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 5f8f89e89d6b..05f257aa2e08 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -355,7 +355,13 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
         int rtap_len;
 
         for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
-                if (info->status.rates[i].idx < 0) {
+                if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
+                    !(info->flags & IEEE80211_TX_STAT_AMPDU)) {
+                        /* just the first aggr frame carry status info */
+                        info->status.rates[i].idx = -1;
+                        info->status.rates[i].count = 0;
+                        break;
+                } else if (info->status.rates[i].idx < 0) {
                         break;
                 } else if (i >= hw->max_report_rates) {
                         /* the HW cannot have attempted that rate */