Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/rc.c

 /*
  * Copyright (c) 2004 Video54 Technologies, Inc.
  * Copyright (c) 2004-2009 Atheros Communications, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
@@ skipping 520 matching lines @@
                                 const struct ath_rate_table *rate_table,
                                 struct ath_rateset *rateset,
                                 u32 capflag)
 {
         u8 i, j, hi = 0;
 
         /* Use intersection of working rates and valid rates */
         for (i = 0; i < rateset->rs_nrates; i++) {
                 for (j = 0; j < rate_table->rate_cnt; j++) {
                         u32 phy = rate_table->info[j].phy;
-                        u16 rate_flags = rate_table->info[j].rate_flags;
+                        u16 rate_flags = rate_table->info[i].rate_flags;

[Sam Leffler, 2010/12/01 00:23:44]

looks like a local patch was dropped

                         u8 rate = rateset->rs_rates[i];
                         u8 dot11rate = rate_table->info[j].dot11rate;
 
                         /* We allow a rate only if its valid and the
                          * capflag matches one of the validity
                          * (VALID/VALID_20/VALID_40) flags */
 
                         if ((rate == dot11rate) &&
                             (rate_flags & WLAN_RC_CAP_MODE(capflag)) ==
                             WLAN_RC_CAP_MODE(capflag) &&
@@ skipping 761 matching lines @@
                         caps |= WLAN_RC_DS_FLAG;
                 if (is_cw40)
                         caps |= WLAN_RC_40_FLAG;
                 if (is_sgi)
                         caps |= WLAN_RC_SGI_FLAG;
         }
 
         return caps;
 }
 
-static bool ath_tx_aggr_check(struct ath_softc *sc, struct ath_node *an,
-                              u8 tidno)
-{
-        struct ath_atx_tid *txtid;
-
-        if (!(sc->sc_flags & SC_OP_TXAGGR))
-                return false;
-
-        txtid = ATH_AN_2_TID(an, tidno);
-
-        if (!(txtid->state & (AGGR_ADDBA_COMPLETE | AGGR_ADDBA_PROGRESS)))
-                        return true;
-        return false;
-}
-
-
 /***********************************/
 /* mac80211 Rate Control callbacks */
 /***********************************/
 
 static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband,
                           struct ieee80211_sta *sta, void *priv_sta,
                           struct sk_buff *skb)
 {
         struct ath_softc *sc = priv;
         struct ath_rate_priv *ath_rc_priv = priv_sta;
@@ skipping 19 matching lines @@
                 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)
                 return;
 
+        if (!(tx_info->flags & IEEE80211_TX_STAT_AMPDU)) {
+                tx_info->status.ampdu_ack_len =
+                        (tx_info->flags & IEEE80211_TX_STAT_ACK ? 1 : 0);
+                tx_info->status.ampdu_len = 1;
+        }
+
         /*
          * If an underrun error is seen assume it as an excessive retry only
          * if max frame trigger level has been reached (2 KB for singel stream,
          * and 4 KB for dual stream). Adjust the long retry as if the frame was
          * tried hw->max_rate_tries times to affect how ratectrl updates PER for
          * the failed rate. In case of congestion on the bus penalizing these
          * type of underruns should help hardware actually transmit new frames
          * successfully by eventually preferring slower rates. This itself
          * should also alleviate congestion on the bus.
          */
@@ skipping 177 matching lines @@
 
 int ath_rate_control_register(void)
 {
         return ieee80211_rate_control_register(&ath_rate_ops);
 }
 
 void ath_rate_control_unregister(void)
 {
         ieee80211_rate_control_unregister(&ath_rate_ops);
 }