Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/net/mac80211/rc80211_minstrel_ht.c

 /*
  * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
 #include <linux/netdevice.h>
 #include <linux/types.h>
 #include <linux/skbuff.h>
@@ skipping 379 matching lines @@
         int i = 0;
 
         if (!msp->is_ht)
                 return mac80211_minstrel.tx_status(priv, sband, sta, &msp->legacy, skb);
 
         /* This packet was aggregated but doesn't carry status info */
         if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
             !(info->flags & IEEE80211_TX_STAT_AMPDU))
                 return;
 
-        if (!info->status.ampdu_len) {
-                info->status.ampdu_ack_len = 1;
+        if (!(info->flags & IEEE80211_TX_STAT_AMPDU)) {
+                info->status.ampdu_ack_len =
+                        (info->flags & IEEE80211_TX_STAT_ACK ? 1 : 0);
                 info->status.ampdu_len = 1;
         }
 
         mi->ampdu_packets++;
         mi->ampdu_len += info->status.ampdu_len;
 
         if (!mi->sample_wait && !mi->sample_tries && mi->sample_count > 0) {
                 mi->sample_wait = 4 + 2 * MINSTREL_TRUNC(mi->avg_ampdu_len);
                 mi->sample_tries = 3;
                 mi->sample_count--;
         }
 
         if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) {
                 mi->sample_packets += info->status.ampdu_len;
                 minstrel_next_sample_idx(mi);
         }
 
         for (i = 0; !last; i++) {
                 last = (i == IEEE80211_TX_MAX_RATES - 1) ||
                        !minstrel_ht_txstat_valid(&ar[i + 1]);
 
                 if (!minstrel_ht_txstat_valid(&ar[i]))
                         break;
 
                 group = minstrel_ht_get_group_idx(&ar[i]);
                 rate = &mi->groups[group].rates[ar[i].idx % 8];
 
-                if (last && (info->flags & IEEE80211_TX_STAT_ACK))
+                if (last)
                         rate->success += info->status.ampdu_ack_len;
 
                 rate->attempts += ar[i].count * info->status.ampdu_len;
         }
 
         /*
          * check for sudden death of spatial multiplexing,
          * downgrade to a lower number of streams if necessary.
          */
         rate = minstrel_get_ratestats(mi, mi->max_tp_rate);
@@ skipping 378 matching lines @@
 {
         init_sample_table();
         return ieee80211_rate_control_register(&mac80211_minstrel_ht);
 }
 
 void
 rc80211_minstrel_ht_exit(void)
 {
         ieee80211_rate_control_unregister(&mac80211_minstrel_ht);
 }