From a55d56e59089a47658f87a273f06fd1c2bf87d76 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 29 Aug 2011 09:55:11 +0000 Subject: ath9k: fix a tx aggregation padding issue git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28113 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mac80211/patches/550-ath9k_limit_qlen.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package/mac80211/patches/550-ath9k_limit_qlen.patch') diff --git a/package/mac80211/patches/550-ath9k_limit_qlen.patch b/package/mac80211/patches/550-ath9k_limit_qlen.patch index 9e144f39c..4356f8109 100644 --- a/package/mac80211/patches/550-ath9k_limit_qlen.patch +++ b/package/mac80211/patches/550-ath9k_limit_qlen.patch @@ -57,7 +57,7 @@ while (bf) { u16 seqno = bf->bf_state.seqno; -@@ -834,6 +844,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_ +@@ -836,6 +846,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_ ath_tx_addto_baw(sc, tid, seqno); ath9k_hw_set11n_aggr_middle(sc->sc_ah, bf->bf_desc, ndelim); @@ -65,7 +65,7 @@ __skb_unlink(skb, &tid->buf_q); list_add_tail(&bf->list, bf_q); if (bf_prev) { -@@ -1489,6 +1500,8 @@ static void ath_tx_send_ampdu(struct ath +@@ -1491,6 +1502,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; -@@ -1817,23 +1830,13 @@ error: +@@ -1819,23 +1832,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) { /* -@@ -1875,6 +1878,7 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1877,6 +1880,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; -@@ -1907,6 +1911,7 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1909,6 +1913,7 @@ int ath_tx_start(struct ieee80211_hw *hw skb_push(skb, padsize); memmove(skb->data, skb->data + padsize, padpos); @@ -116,7 +116,7 @@ } if ((vif && vif->type != NL80211_IFTYPE_AP && -@@ -1916,6 +1921,24 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1918,6 +1923,24 @@ int ath_tx_start(struct ieee80211_hw *hw setup_frame_info(hw, skb, frmlen); @@ -141,7 +141,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 +1953,7 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1932,7 +1955,7 @@ int ath_tx_start(struct ieee80211_hw *hw } spin_unlock_bh(&txq->axq_lock); -- cgit v1.2.3