diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-30 01:01:06 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-30 01:01:06 +0000 |
commit | a3657acc2bf23df97f226f45558eed1e194fd217 (patch) | |
tree | ddbb857e08e6eb21ee8427a2f433273ee056a28f /package/mac80211/patches/530-ath9k_limit_qlen.patch | |
parent | 80f0c401c284347a24cb5695a1346257480e1190 (diff) |
mac80211: update to wireless-testing 2012-05-29
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32002 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/530-ath9k_limit_qlen.patch')
-rw-r--r-- | package/mac80211/patches/530-ath9k_limit_qlen.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/mac80211/patches/530-ath9k_limit_qlen.patch b/package/mac80211/patches/530-ath9k_limit_qlen.patch index 5a9275ba73..22b4102d10 100644 --- a/package/mac80211/patches/530-ath9k_limit_qlen.patch +++ b/package/mac80211/patches/530-ath9k_limit_qlen.patch @@ -33,7 +33,7 @@ debugfs_create_file("misc", S_IRUSR, sc->debug.debugfs_phy, sc, --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -392,6 +392,14 @@ static void ath_tx_count_frames(struct a +@@ -393,6 +393,14 @@ static void ath_tx_count_frames(struct a } } @@ -48,7 +48,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, struct ath_buf *bf, struct list_head *bf_q, -@@ -486,6 +494,8 @@ static void ath_tx_complete_aggr(struct +@@ -487,6 +495,8 @@ static void ath_tx_complete_aggr(struct __skb_queue_head_init(&bf_pending); ath_tx_count_frames(sc, bf, ts, txok, &nframes, &nbad); @@ -57,7 +57,7 @@ while (bf) { u16 seqno = bf->bf_state.seqno; -@@ -884,6 +894,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_ +@@ -885,6 +895,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) -@@ -1737,6 +1748,8 @@ static void ath_tx_send_ampdu(struct ath +@@ -1738,6 +1749,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; -@@ -1869,22 +1882,11 @@ error: +@@ -1873,22 +1886,11 @@ error: /* FIXME: tx power */ static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb, @@ -99,7 +99,7 @@ if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && tid) { /* -@@ -1916,6 +1918,7 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1920,6 +1922,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; @@ -107,7 +107,7 @@ int padpos, padsize; int frmlen = skb->len + FCS_LEN; int q; -@@ -1958,6 +1961,24 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1962,6 +1965,24 @@ int ath_tx_start(struct ieee80211_hw *hw setup_frame_info(hw, skb, frmlen); @@ -132,7 +132,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. -@@ -1972,7 +1993,7 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1976,7 +1997,7 @@ int ath_tx_start(struct ieee80211_hw *hw txq->stopped = true; } |