fix jffs2 and mini_fo mount in failsafe (patch from #7134)

[openwrt.git] / package / madwifi / patches / 325-channel_spam.patch

diff --git a/package/madwifi/patches/325-channel_spam.patch b/package/madwifi/patches/325-channel_spam.patch
index e3318ff..a4b9463 100644 (file)
--- a/package/madwifi/patches/325-channel_spam.patch
+++ b/package/madwifi/patches/325-channel_spam.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 21:58:53.697219623 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 21:58:58.545495909 +0100
-@@ -9776,7 +9776,9 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -9792,7 +9792,9 @@ ath_getchannels(struct net_device *dev, 
        /*
         * Convert HAL channels to ieee80211 ones.
         */
@@ -12,7 +10,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        for (i = 0; i < nchan; i++) {
                HAL_CHANNEL *c = &chans[i];
                struct ieee80211_channel *ichan = &ic->ic_channels[i];
-@@ -9803,6 +9805,7 @@
+@@ -9819,6 +9821,7 @@ ath_getchannels(struct net_device *dev, 
                ic->ic_chan_non_occupy[i].tv_sec  = 0;
                ic->ic_chan_non_occupy[i].tv_usec = 0;
  
@@ -20,7 +18,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                IPRINTF(sc, "Channel %3d (%4d MHz) Max Tx Power %d dBm%s "
                                "[%d hw %d reg] Flags%s%s%s%s%s%s%s%s%s%s%s%s%"
                                "s%s%s%s%s%s%s%s%s%s%s%s\n",
-@@ -9891,6 +9894,7 @@
+@@ -9907,6 +9910,7 @@ ath_getchannels(struct net_device *dev, 
                                (c->privFlags & 0x0080 ? 
                                 " PF & (1 << 7)" : "")
                                );