ath9k: backport fixes from r30009, r30010

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@30012 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/mac80211/patches/568-ath9k_fix_wep.patch b/package/mac80211/patches/568-ath9k_fix_wep.patch
new file mode 100644 (file)
index 0000000..f18553f
--- /dev/null
+++ b/package/mac80211/patches/568-ath9k_fix_wep.patch
@@ -0,0 +1,17 @@
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -823,6 +823,14 @@ static bool ath9k_rx_accept(struct ath_c
+               (ATH9K_RXERR_DECRYPT | ATH9K_RXERR_CRC | ATH9K_RXERR_MIC |
+                ATH9K_RXERR_KEYMISS));
+ 
++      /*
++       * Key miss events are only relevant for pairwise keys where the
++       * descriptor does contain a valid key index. This has been observed
++       * mostly with CCMP encryption.
++       */
++      if (rx_stats->rs_keyix == ATH9K_RXKEYIX_INVALID)
++              rx_stats->rs_status &= ~ATH9K_RXERR_KEYMISS;
++
+       if (!rx_stats->rs_datalen)
+               return false;
+         /*

diff --git a/package/mac80211/patches/569-ath9k_fix_cts.patch b/package/mac80211/patches/569-ath9k_fix_cts.patch
new file mode 100644 (file)
index 0000000..fefa065
--- /dev/null
+++ b/package/mac80211/patches/569-ath9k_fix_cts.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -1061,13 +1061,16 @@ void ath9k_hw_init_global_settings(struc
+ 
+       /*
+        * Workaround for early ACK timeouts, add an offset to match the
+-       * initval's 64us ack timeout value.
++       * initval's 64us ack timeout value. Use 48us for the CTS timeout.
+        * This was initially only meant to work around an issue with delayed
+        * BA frames in some implementations, but it has been found to fix ACK
+        * timeout issues in other cases as well.
+        */
+-      if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ)
++      if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ) {
+               acktimeout += 64 - sifstime - ah->slottime;
++              ctstimeout += 48 - sifstime - ah->slottime;
++      }
++
+ 
+       ath9k_hw_set_sifs_time(ah, sifstime);
+       ath9k_hw_setslottime(ah, slottime);

diff --git a/package/mac80211/patches/571-ath9k_btcoex_optional.patch b/package/mac80211/patches/571-ath9k_btcoex_optional.patch
index c73ad1a4f3fda0e1466e95583bfaa8c0ac59e0c8..046a35777f97eacd3347ded6c4f3b80b45e3b224 100644 (file)
--- a/package/mac80211/patches/571-ath9k_btcoex_optional.patch
+++ b/package/mac80211/patches/571-ath9k_btcoex_optional.patch
@@ -203,7 +203,7 @@
        if (btcoex->hw_timer_enabled)
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
        if (btcoex->hw_timer_enabled)
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c

-@@ -1929,7 +1929,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1932,7 +1932,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st

  #endif
        }
  
  #endif
        }