aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-12 03:24:53 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-12 03:24:53 +0000
commit6493242f94c6fe524e9f5cee79f9efca4b49fa58 (patch)
tree1a8ef40a51f953f48862aa5858f0ff4c07b36e4f
parent0321740a622fe79cdf958985188cc81476bef192 (diff)
downloadupstream-6493242f94c6fe524e9f5cee79f9efca4b49fa58.tar.gz
upstream-6493242f94c6fe524e9f5cee79f9efca4b49fa58.tar.bz2
upstream-6493242f94c6fe524e9f5cee79f9efca4b49fa58.zip
ath9k: fix mic frame handling for bigger packets
SVN-Revision: 27596
-rw-r--r--package/mac80211/patches/550-ath9k_mmic_verify.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/550-ath9k_mmic_verify.patch b/package/mac80211/patches/550-ath9k_mmic_verify.patch
index 053d543cb0..1918e11d7c 100644
--- a/package/mac80211/patches/550-ath9k_mmic_verify.patch
+++ b/package/mac80211/patches/550-ath9k_mmic_verify.patch
@@ -70,13 +70,13 @@
return true;
}
-@@ -1882,6 +1881,9 @@ int ath_rx_tasklet(struct ath_softc *sc,
- ath9k_rx_skb_postprocess(common, hdr_skb, &rs,
- rxs, decrypt_error);
+@@ -1940,6 +1939,9 @@ int ath_rx_tasklet(struct ath_softc *sc,
+ sc->rx.rxotherant = 0;
+ }
+ if (rxs->flag & RX_FLAG_MMIC_STRIPPED)
+ skb_trim(skb, skb->len - 8);
+
- /* We will now give hardware our shiny new allocated skb */
- bf->bf_mpdu = requeue_skb;
- bf->bf_buf_addr = dma_map_single(sc->dev, requeue_skb->data,
+ spin_lock_irqsave(&sc->sc_pm_lock, flags);
+
+ if ((sc->ps_flags & (PS_WAIT_FOR_BEACON |