brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / package / madwifi / patches / 349-reset.patch

diff --git a/package/madwifi/patches/349-reset.patch b/package/madwifi/patches/349-reset.patch
index f52f0b0..06e3fa8 100644 (file)
--- a/package/madwifi/patches/349-reset.patch
+++ b/package/madwifi/patches/349-reset.patch
@@ -1,17 +1,6 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c
-+++ madwifi-trunk-r3314/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 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -8864,8 +8864,7 @@ ath_chan_set(struct ath_softc *sc, struc

                 * needed to do the reset with chanchange = AH_FALSE in order
                 * to receive traffic when peforming high velocity channel
                 * changes. */
                 * needed to do the reset with chanchange = AH_FALSE in order
                 * to receive traffic when peforming high velocity channel
                 * changes. */