aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/300-pending_work.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-04-21 20:34:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-04-21 20:34:33 +0000
commit1bc606c5363f65c16ef076a07f6494f6fec9b4a2 (patch)
treeb65a8f7ab47032fae90ca970f017280e9cffb03b /package/mac80211/patches/300-pending_work.patch
parenteb2128eaa67bcc646b0b84a170fbc532c9fe8b18 (diff)
downloadmaster-187ad058-1bc606c5363f65c16ef076a07f6494f6fec9b4a2.tar.gz
master-187ad058-1bc606c5363f65c16ef076a07f6494f6fec9b4a2.tar.bz2
master-187ad058-1bc606c5363f65c16ef076a07f6494f6fec9b4a2.zip
ath9k: merge a tkip related stability fix
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31428 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/300-pending_work.patch')
-rw-r--r--package/mac80211/patches/300-pending_work.patch10
1 files changed, 10 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 9fc2e2c0ef..333cda5a4d 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -802,3 +802,13 @@
#include "dev.h"
#include "decl.h"
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -812,6 +812,7 @@ static bool ath9k_rx_accept(struct ath_c
+ is_valid_tkip = rx_stats->rs_keyix != ATH9K_RXKEYIX_INVALID &&
+ test_bit(rx_stats->rs_keyix, common->tkip_keymap);
+ strip_mic = is_valid_tkip && ieee80211_is_data(fc) &&
++ ieee80211_has_protected(fc) &&
+ !(rx_stats->rs_status &
+ (ATH9K_RXERR_DECRYPT | ATH9K_RXERR_CRC | ATH9K_RXERR_MIC |
+ ATH9K_RXERR_KEYMISS));