diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-21 20:34:33 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-21 20:34:33 +0000 |
| commit | 1cf5c0f4c8dac74bea2b02e8e15c838ac4236519 (patch) | |
| tree | b65a8f7ab47032fae90ca970f017280e9cffb03b /package | |
| parent | 031a7820e2f770c462c0543c554bd58f0515bbe2 (diff) | |
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')
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 10 | ||||
| -rw-r--r-- | package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index 9fc2e2c0e..333cda5a4 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)); diff --git a/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch b/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch index 1b7782cf8..d8e46dfaf 100644 --- a/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch +++ b/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch @@ -137,7 +137,7 @@ u8 rs_num_delims; --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c -@@ -987,6 +987,7 @@ static int ath9k_rx_skb_preprocess(struc +@@ -988,6 +988,7 @@ static int ath9k_rx_skb_preprocess(struc bool *decrypt_error) { struct ath_hw *ah = common->ah; @@ -145,7 +145,7 @@ /* * everything but the rate is checked here, the rate check is done -@@ -1012,6 +1013,20 @@ static int ath9k_rx_skb_preprocess(struc +@@ -1013,6 +1014,20 @@ static int ath9k_rx_skb_preprocess(struc if (rx_stats->rs_moreaggr) rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL; @@ -166,7 +166,7 @@ return 0; } -@@ -1542,14 +1557,14 @@ static void ath_ant_comb_scan(struct ath +@@ -1543,14 +1558,14 @@ static void ath_ant_comb_scan(struct ath struct ath_ant_comb *antcomb = &sc->ant_comb; int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set; int curr_main_set; |