Update compat-wireless to 2.6.36-5-spn

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

 /*
  * Copyright (c) 2010 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
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include "htc.h"
 
 /******/
 /* TX */
 /******/
 
+static const int subtype_txq_to_hwq[] = {
+        [WME_AC_BE] = ATH_TXQ_AC_BE,
+        [WME_AC_BK] = ATH_TXQ_AC_BK,
+        [WME_AC_VI] = ATH_TXQ_AC_VI,
+        [WME_AC_VO] = ATH_TXQ_AC_VO,
+};
+
 #define ATH9K_HTC_INIT_TXQ(subtype) do {                        \
-                qi.tqi_subtype = subtype;                       \
+                qi.tqi_subtype = subtype_txq_to_hwq[subtype];   \
                 qi.tqi_aifs = ATH9K_TXQ_USEDEFAULT;             \
                 qi.tqi_cwmin = ATH9K_TXQ_USEDEFAULT;            \
                 qi.tqi_cwmax = ATH9K_TXQ_USEDEFAULT;            \
                 qi.tqi_physCompBuf = 0;                         \
                 qi.tqi_qflags = TXQ_FLAG_TXEOLINT_ENABLE |      \
                         TXQ_FLAG_TXDESCINT_ENABLE;              \
         } while (0)
 
 int get_hw_qnum(u16 queue, int *hwq_map)
 {
@@ skipping 36 matching lines @@
 
         return error;
 }
 
 int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb)
 {
         struct ieee80211_hdr *hdr;
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         struct ieee80211_sta *sta = tx_info->control.sta;
         struct ath9k_htc_sta *ista;
-        struct ath9k_htc_vif *avp;
         struct ath9k_htc_tx_ctl tx_ctl;
         enum htc_endpoint_id epid;
         u16 qnum;
         __le16 fc;
         u8 *tx_fhdr;
-        u8 sta_idx;
+        u8 sta_idx, vif_idx;
 
         hdr = (struct ieee80211_hdr *) skb->data;
         fc = hdr->frame_control;
 
-        avp = (struct ath9k_htc_vif *) tx_info->control.vif->drv_priv;
+        if (tx_info->control.vif &&
+                        (struct ath9k_htc_vif *) tx_info->control.vif->drv_priv)
+                vif_idx = ((struct ath9k_htc_vif *)
+                                tx_info->control.vif->drv_priv)->index;
+        else
+                vif_idx = priv->nvifs;
+
         if (sta) {
                 ista = (struct ath9k_htc_sta *) sta->drv_priv;
                 sta_idx = ista->index;
         } else {
                 sta_idx = 0;
         }
 
         memset(&tx_ctl, 0, sizeof(struct ath9k_htc_tx_ctl));
 
         if (ieee80211_is_data(fc)) {
                 struct tx_frame_hdr tx_hdr;
                 u8 *qc;
 
                 memset(&tx_hdr, 0, sizeof(struct tx_frame_hdr));
 
                 tx_hdr.node_idx = sta_idx;
-                tx_hdr.vif_idx = avp->index;
+                tx_hdr.vif_idx = vif_idx;
 
                 if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
                         tx_ctl.type = ATH9K_HTC_AMPDU;
                         tx_hdr.data_type = ATH9K_HTC_AMPDU;
                 } else {
                         tx_ctl.type = ATH9K_HTC_NORMAL;
                         tx_hdr.data_type = ATH9K_HTC_NORMAL;
                 }
 
                 if (ieee80211_is_data(fc)) {
@@ skipping 42 matching lines @@
                         break;
                 }
         } else {
                 struct tx_mgmt_hdr mgmt_hdr;
 
                 memset(&mgmt_hdr, 0, sizeof(struct tx_mgmt_hdr));
 
                 tx_ctl.type = ATH9K_HTC_NORMAL;
 
                 mgmt_hdr.node_idx = sta_idx;
-                mgmt_hdr.vif_idx = avp->index;
+                mgmt_hdr.vif_idx = vif_idx;
                 mgmt_hdr.tidno = 0;
                 mgmt_hdr.flags = 0;
 
                 mgmt_hdr.key_type = ath9k_cmn_get_hw_crypto_keytype(skb);
                 if (mgmt_hdr.key_type == ATH9K_KEY_TYPE_CLEAR)
                         mgmt_hdr.keyix = (u8) ATH9K_TXKEYIX_INVALID;
                 else
                         mgmt_hdr.keyix = tx_info->control.hw_key->hw_key_idx;
 
                 tx_fhdr = skb_push(skb, sizeof(mgmt_hdr));
@@ skipping 541 matching lines @@
                 }
                 list_add_tail(&rxbuf->list, &priv->rx.rxbuf);
         }
 
         return 0;
 
 err:
         ath9k_rx_cleanup(priv);
         return -ENOMEM;
 }