revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / rc80211_minstrel_ht.c

diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index 2a18d6602d4ade8bc385fecc4bca919811875ba1..c5b465904e3bfcec2ac0199e64dda46072022330 100644 (file)
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -397,9 +397,8 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
            !(info->flags & IEEE80211_TX_STAT_AMPDU))
                return;
 
-       if (!(info->flags & IEEE80211_TX_STAT_AMPDU)) {
-               info->status.ampdu_ack_len =
-                       (info->flags & IEEE80211_TX_STAT_ACK ? 1 : 0);
+       if (!info->status.ampdu_len) {
+               info->status.ampdu_ack_len = 1;
                info->status.ampdu_len = 1;
        }
 
@@ -427,7 +426,7 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
                group = minstrel_ht_get_group_idx(&ar[i]);
                rate = &mi->groups[group].rates[ar[i].idx % 8];
 
-               if (last)
+               if (last && (info->flags & IEEE80211_TX_STAT_ACK))
                        rate->success += info->status.ampdu_ack_len;
 
                rate->attempts += ar[i].count * info->status.ampdu_len;