aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-09-14 11:40:51 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-09-14 11:40:51 +0000
commit6ea49c5e135e8700ac342c4b5fb1fa5cc460f74c (patch)
treef06b77400b5e8b9cc51832a70c4e949badaef77c
parent762ddec48b7d0458f4b8f05bf7990e42d89e3760 (diff)
downloadupstream-6ea49c5e135e8700ac342c4b5fb1fa5cc460f74c.tar.gz
upstream-6ea49c5e135e8700ac342c4b5fb1fa5cc460f74c.tar.bz2
upstream-6ea49c5e135e8700ac342c4b5fb1fa5cc460f74c.zip
ath9k_htc: fix decryption errors
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42530
-rw-r--r--package/kernel/mac80211/patches/300-pending_work.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch
index fc1ff10744..78e3d7cb22 100644
--- a/package/kernel/mac80211/patches/300-pending_work.patch
+++ b/package/kernel/mac80211/patches/300-pending_work.patch
@@ -1,3 +1,21 @@
+commit fb77a822cc68745186b38db7d105ad97e0622152
+Author: Johannes Stezenbach <js@sig21.net>
+Date: Fri Sep 12 22:36:51 2014 +0200
+
+ ath9k_htc: fix random decryption failure
+
+ In v3.15 the driver stopped to accept network packets after successful
+ authentification, which could be worked around by passing the
+ nohwcrypt=1 module parameter. This was not reproducible by
+ everyone, and showed random behaviour in some tests.
+ It was caused by an uninitialized variable introduced
+ in 4ed1a8d4a257 ("ath9k_htc: use ath9k_cmn_rx_accept") and
+ used in 341b29b9cd2f ("ath9k_htc: use ath9k_cmn_rx_skb_postprocess").
+
+ Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=78581
+ Fixes: 341b29b9cd2f ("ath9k_htc: use ath9k_cmn_rx_skb_postprocess")
+ Signed-off-by: Johannes Stezenbach <js@sig21.net>
+
commit 11f17631d9bf2a9e910dac7d09ba4581f5693831
Author: Felix Fietkau <nbd@openwrt.org>
Date: Tue Sep 9 09:48:30 2014 +0200
@@ -3291,3 +3309,14 @@ Date: Mon May 19 21:20:49 2014 +0200
#define AR_RTC_9160_PLL_DIV 0x000003ff
#define AR_RTC_9160_PLL_DIV_S 0
+--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
++++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+@@ -978,7 +978,7 @@ static bool ath9k_rx_prepare(struct ath9
+ struct ath_hw *ah = common->ah;
+ struct ath_htc_rx_status *rxstatus;
+ struct ath_rx_status rx_stats;
+- bool decrypt_error;
++ bool decrypt_error = false;
+
+ if (skb->len < HTC_RX_FRAME_HEADER_SIZE) {
+ ath_err(common, "Corrupted RX frame, dropping (len: %d)\n",