From adfeb00e5a06d9ea3eb67564e2ccf2022ffdffe6 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 9 Oct 2011 15:48:03 +0000 Subject: mac80211: update to wireless-testing 2011-10-05 + pending patches SVN-Revision: 28392 --- package/mac80211/patches/540-ath9k_limit_qlen.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to '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 e4d56485b4..7cd8b9f56a 100644 --- a/package/mac80211/patches/540-ath9k_limit_qlen.patch +++ b/package/mac80211/patches/540-ath9k_limit_qlen.patch @@ -20,7 +20,7 @@ spinlock_t txbuflock; --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1654,6 +1654,10 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1679,6 +1679,10 @@ int ath9k_init_debug(struct ath_hw *ah) sc, &fops_wiphy); debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy, sc, &fops_xmit); @@ -57,7 +57,7 @@ while (bf) { u16 seqno = bf->bf_state.seqno; -@@ -816,6 +826,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_ +@@ -821,6 +831,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_ ath_tx_addto_baw(sc, tid, seqno); bf->bf_state.ndelim = ndelim; @@ -65,7 +65,7 @@ __skb_unlink(skb, &tid->buf_q); list_add_tail(&bf->list, bf_q); if (bf_prev) -@@ -1693,6 +1704,8 @@ static void ath_tx_send_ampdu(struct ath +@@ -1687,6 +1698,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; -@@ -1821,23 +1834,13 @@ error: +@@ -1815,23 +1828,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) { /* -@@ -1872,6 +1875,7 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1866,6 +1869,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; -@@ -1916,6 +1920,24 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1908,6 +1912,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. -@@ -1930,7 +1952,7 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1922,7 +1944,7 @@ int ath_tx_start(struct ieee80211_hw *hw } spin_unlock_bh(&txq->axq_lock); -- cgit v1.2.3