madwifi: remove unnecessary part of the 349-reset.patch, add an ANI fix for future...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11409 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/madwifi/patches/349-reset.patch b/package/madwifi/patches/349-reset.patch
index 783022868a587b6f5982d4c143323d47e8c893fc..1047dd23d2b3af51f8e4564ee4b9400faf02d606 100644 (file)
--- a/package/madwifi/patches/349-reset.patch
+++ b/package/madwifi/patches/349-reset.patch
@@ -1,14 +1,5 @@
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c
-@@ -2479,7 +2479,7 @@
-        */
-       sc->sc_curchan.channel = ic->ic_curchan->ic_freq;
-       sc->sc_curchan.channelFlags = ath_chan2flags(ic->ic_curchan);
--      if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_FALSE, &status)) {
-+      if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_TRUE, &status)) {
-               EPRINTF(sc, "unable to reset hardware: '%s' (HAL status %u) "
-                       "(freq %u flags 0x%x)\n", 
-                       ath_get_hal_status_desc(status), status,
 @@ -8853,8 +8853,7 @@
                 * needed to do the reset with chanchange = AH_FALSE in order
                 * to receive traffic when peforming high velocity channel

diff --git a/package/madwifi/patches/352-ani_fix.patch b/package/madwifi/patches/352-ani_fix.patch
new file mode 100644 (file)
index 0000000..83a0ef4
--- /dev/null
+++ b/package/madwifi/patches/352-ani_fix.patch
@@ -0,0 +1,13 @@
+Index: madwifi-trunk-r3314/ath/if_ath.c
+===================================================================
+--- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-06-01 20:07:35.000000000 +0200
++++ madwifi-trunk-r3314/ath/if_ath.c   2008-06-01 20:17:01.000000000 +0200
+@@ -2528,7 +2528,7 @@
+        * Enable MIB interrupts when there are hardware phy counters.
+        * Note we only do this (at the moment) for station mode.
+        */
+-      if (sc->sc_needmib && ic->ic_opmode == IEEE80211_M_STA)
++      if (sc->sc_needmib)
+               sc->sc_imask |= HAL_INT_MIB;
+       ath_hal_intrset(ah, sc->sc_imask);
+