diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-12-04 22:59:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-12-04 22:59:36 +0000 |
| commit | 95065c08b0d9e6a8631e40d442ee2f60e480218a (patch) | |
| tree | 89627f240a7009267afd520b019e36ed68870881 /package/kernel | |
| parent | fb6ebac74a20fbbbd03887f811f22d21d1f47bba (diff) | |
| download | upstream-95065c08b0d9e6a8631e40d442ee2f60e480218a.tar.gz upstream-95065c08b0d9e6a8631e40d442ee2f60e480218a.tar.bz2 upstream-95065c08b0d9e6a8631e40d442ee2f60e480218a.zip | |
ath9k: fix length handling of unaggregated frames (might resolve some rts/cts issues)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 38995
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/mac80211/patches/300-pending_work.patch | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch index 4532a03d57..b3583a3896 100644 --- a/package/kernel/mac80211/patches/300-pending_work.patch +++ b/package/kernel/mac80211/patches/300-pending_work.patch @@ -2272,7 +2272,18 @@ -EXPORT_SYMBOL(ath9k_hw_wow_enable); --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -1786,6 +1786,9 @@ bool ath_drain_all_txq(struct ath_softc +@@ -1276,6 +1276,10 @@ static void ath_tx_fill_desc(struct ath_ + if (!rts_thresh || (len > rts_thresh)) + rts = true; + } ++ ++ if (!aggr) ++ len = fi->framelen; ++ + ath_buf_set_rate(sc, bf, &info, len, rts); + } + +@@ -1786,6 +1790,9 @@ bool ath_drain_all_txq(struct ath_softc if (!ATH_TXQ_SETUP(sc, i)) continue; @@ -2282,7 +2293,7 @@ if (ath9k_hw_numtxpending(ah, sc->tx.txq[i].axq_qnum)) npend |= BIT(i); } -@@ -2749,6 +2752,8 @@ void ath_tx_node_cleanup(struct ath_soft +@@ -2749,6 +2756,8 @@ void ath_tx_node_cleanup(struct ath_soft } } @@ -2291,7 +2302,7 @@ int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb, struct ath_tx_control *txctl) { -@@ -2791,3 +2796,5 @@ int ath9k_tx99_send(struct ath_softc *sc +@@ -2791,3 +2800,5 @@ int ath9k_tx99_send(struct ath_softc *sc return 0; } |