ath9k: merge a pending aggregation fix

[openwrt.git] / package / madwifi / patches / 122-replayfail_workaround.patch

diff --git a/package/madwifi/patches/122-replayfail_workaround.patch b/package/madwifi/patches/122-replayfail_workaround.patch
index 49f1a13..c4eb28c 100644 (file)
--- a/package/madwifi/patches/122-replayfail_workaround.patch
+++ b/package/madwifi/patches/122-replayfail_workaround.patch
@@ -1,13 +1,12 @@
-diff -ur madwifi.old/net80211/ieee80211_linux.c madwifi.dev/net80211/ieee80211_linux.c
---- madwifi.old/net80211/ieee80211_linux.c     2007-05-30 03:41:18.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_linux.c     2007-06-02 01:43:40.818092096 +0200
-@@ -285,6 +285,9 @@
+--- a/net80211/ieee80211_linux.c
++++ b/net80211/ieee80211_linux.c
+@@ -331,6 +331,9 @@ ieee80211_notify_replay_failure(struct i

                k->wk_cipher->ic_name, k->wk_keyix,
                k->wk_cipher->ic_name, k->wk_keyix,

-               (unsigned long long)rsc );
+               (unsigned long long)rsc);

  
 +      /* disabled for now due to bogus events for unknown reasons */
 +      return;
 +
        /* TODO: needed parameters: count, keyid, key type, src address, TSC */
  
 +      /* disabled for now due to bogus events for unknown reasons */
 +      return;
 +
        /* TODO: needed parameters: count, keyid, key type, src address, TSC */

-       snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag,
+       snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=" MAC_FMT ")", tag,

                k->wk_keyix,
                k->wk_keyix,