mac80211: update to wireless-testing 2011-11-01

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 540-ath9k_limit_qlen.patch

diff --git a/package/mac80211/patches/540-ath9k_limit_qlen.patch b/package/mac80211/patches/540-ath9k_limit_qlen.patch
index 7cd8b9f56a5a512c46f0c8dc7a00362e4afc4d14..6f616752bff56dbb95ad5fb4538e8c3a939ed62c 100644 (file)
--- a/package/mac80211/patches/540-ath9k_limit_qlen.patch
+++ b/package/mac80211/patches/540-ath9k_limit_qlen.patch
@@ -65,7 +65,7 @@
                __skb_unlink(skb, &tid->buf_q);
                list_add_tail(&bf->list, bf_q);
                if (bf_prev)
-@@ -1687,6 +1698,8 @@ static void ath_tx_send_ampdu(struct ath
+@@ -1680,6 +1691,8 @@ static void ath_tx_send_ampdu(struct ath
        /* Add sub-frame to BAW */
        ath_tx_addto_baw(sc, tid, bf->bf_state.seqno);
  
@@ -74,7 +74,7 @@
        /* Queue to h/w without aggregation */
        TX_STAT_INC(txctl->txq->axq_qnum, a_queued_hw);
        bf->bf_lastbf = bf;
-@@ -1815,23 +1828,13 @@ error:
+@@ -1808,23 +1821,13 @@ error:
  
  /* FIXME: tx power */
  static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,
@@ -100,7 +100,7 @@
  
        if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && tid) {
                /*
-@@ -1866,6 +1869,7 @@ int ath_tx_start(struct ieee80211_hw *hw
+@@ -1859,6 +1862,7 @@ int ath_tx_start(struct ieee80211_hw *hw
        struct ieee80211_vif *vif = info->control.vif;
        struct ath_softc *sc = hw->priv;
        struct ath_txq *txq = txctl->txq;
@@ -108,7 +108,7 @@
        int padpos, padsize;
        int frmlen = skb->len + FCS_LEN;
        int q;
-@@ -1908,6 +1912,24 @@ int ath_tx_start(struct ieee80211_hw *hw
+@@ -1901,6 +1905,24 @@ int ath_tx_start(struct ieee80211_hw *hw
  
        setup_frame_info(hw, skb, frmlen);
  
@@ -133,7 +133,7 @@
        /*
         * At this point, the vif, hw_key and sta pointers in the tx control
         * info are no longer valid (overwritten by the ath_frame_info data.
-@@ -1922,7 +1944,7 @@ int ath_tx_start(struct ieee80211_hw *hw
+@@ -1915,7 +1937,7 @@ int ath_tx_start(struct ieee80211_hw *hw
        }
        spin_unlock_bh(&txq->axq_lock);