Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/net/mac80211/agg-tx.c

 /*
  * HT handling
  *
  * Copyright 2003, Jouni Malinen <jkmaline@cc.hut.fi>
  * Copyright 2002-2005, Instant802 Networks, Inc.
  * Copyright 2005-2006, Devicescape Software, Inc.
  * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
  * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
  * Copyright 2007-2010, Intel Corporation
  *
@@ skipping 127 matching lines @@
 
 static void kfree_tid_tx(struct rcu_head *rcu_head)
 {
         struct tid_ampdu_tx *tid_tx =
             container_of(rcu_head, struct tid_ampdu_tx, rcu_head);
 
         kfree(tid_tx);
 }
 
 int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
-                                    enum ieee80211_back_parties initiator,
-                                    bool tx)
+                                    enum ieee80211_back_parties initiator)
 {
         struct ieee80211_local *local = sta->local;
         struct tid_ampdu_tx *tid_tx = sta->ampdu_mlme.tid_tx[tid];
         int ret;
 
         lockdep_assert_held(&sta->ampdu_mlme.mtx);
 
         if (!tid_tx)
                 return -ENOENT;
 
@@ skipping 19 matching lines @@
         del_timer_sync(&tid_tx->addba_resp_timer);
 
         /*
          * After this packets are no longer handed right through
          * to the driver but are put onto tid_tx->pending instead,
          * with locking to ensure proper access.
          */
         clear_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state);
 
         tid_tx->stop_initiator = initiator;
-        tid_tx->tx_stop = tx;
 
         ret = drv_ampdu_action(local, sta->sdata,
                                IEEE80211_AMPDU_TX_STOP,
                                &sta->sta, tid, NULL);
 
         /* HW shall not deny going back to legacy */
         if (WARN_ON(ret)) {
                 /*
                  * We may have pending packets get stuck in this case...
                  * Not bothering with a workaround for now.
@@ skipping 372 matching lines @@
         memcpy(&ra_tid->ra, ra, ETH_ALEN);
         ra_tid->tid = tid;
 
         skb->pkt_type = IEEE80211_SDATA_QUEUE_AGG_START;
         skb_queue_tail(&sdata->skb_queue, skb);
         ieee80211_queue_work(&local->hw, &sdata->work);
 }
 EXPORT_SYMBOL(ieee80211_start_tx_ba_cb_irqsafe);
 
 int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
-                                   enum ieee80211_back_parties initiator,
-                                   bool tx)
+                                   enum ieee80211_back_parties initiator)
 {
         int ret;
 
         mutex_lock(&sta->ampdu_mlme.mtx);
 
-        ret = ___ieee80211_stop_tx_ba_session(sta, tid, initiator, tx);
+        ret = ___ieee80211_stop_tx_ba_session(sta, tid, initiator);
 
         mutex_unlock(&sta->ampdu_mlme.mtx);
 
         return ret;
 }
 
 int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)
 {
         struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
         struct ieee80211_sub_if_data *sdata = sta->sdata;
@@ skipping 68 matching lines @@
         spin_lock_bh(&sta->lock);
         tid_tx = sta->ampdu_mlme.tid_tx[tid];
 
         if (!tid_tx || !test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
 #ifdef CONFIG_MAC80211_HT_DEBUG
                 printk(KERN_DEBUG "unexpected callback to A-MPDU stop\n");
 #endif
                 goto unlock_sta;
         }
 
-        if (tid_tx->stop_initiator == WLAN_BACK_INITIATOR && tid_tx->tx_stop)
+        if (tid_tx->stop_initiator == WLAN_BACK_INITIATOR)
                 ieee80211_send_delba(sta->sdata, ra, tid,
                         WLAN_BACK_INITIATOR, WLAN_REASON_QSTA_NOT_USE);
 
         /*
          * When we get here, the TX path will not be lockless any more wrt.
          * aggregation, since the OPERATIONAL bit has long been cleared.
          * Thus it will block on getting the lock, if it occurs. So if we
          * stop the queue now, we will not get any more packets, and any
          * that might be being processed will wait for us here, thereby
          * guaranteeing that no packets go to the tid_tx pending queue any
@@ skipping 79 matching lines @@
                                      &tid_tx->state)) {
                         /* ignore duplicate response */
                         goto out;
                 }
 
                 if (test_bit(HT_AGG_STATE_DRV_READY, &tid_tx->state))
                         ieee80211_agg_tx_operational(local, sta, tid);
 
                 sta->ampdu_mlme.addba_req_num[tid] = 0;
         } else {
-                ___ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_INITIATOR,
-                                                true);
+                ___ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_INITIATOR);
         }
 
  out:
         mutex_unlock(&sta->ampdu_mlme.mtx);
 }