aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-06-09 10:17:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-06-09 10:17:36 +0000
commit62bef2bced78e4abadbcf86ed0aa79fec209559a (patch)
tree963de3c400ac62740a2b1ea21ef28ac2bf6fc570
parentea8b4cb0d74fcc3a5e851c8d077b3c0d7639eb6d (diff)
downloadupstream-62bef2bced78e4abadbcf86ed0aa79fec209559a.tar.gz
upstream-62bef2bced78e4abadbcf86ed0aa79fec209559a.tar.bz2
upstream-62bef2bced78e4abadbcf86ed0aa79fec209559a.zip
madwifi: remove unnecessary part of the 349-reset.patch, add an ANI fix for future HALs
SVN-Revision: 11409
-rw-r--r--package/madwifi/patches/349-reset.patch9
-rw-r--r--package/madwifi/patches/352-ani_fix.patch13
2 files changed, 13 insertions, 9 deletions
diff --git a/package/madwifi/patches/349-reset.patch b/package/madwifi/patches/349-reset.patch
index 783022868a..1047dd23d2 100644
--- 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
index 0000000000..83a0ef4e11
--- /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);
+