aboutsummaryrefslogtreecommitdiffstats
path: root/package/madwifi/patches/389-autochannel.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-12-04 19:54:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-12-04 19:54:16 +0000
commit130413bb0f1de803e52cd168c59373b3e6473f4e (patch)
tree2c7f24a769e11d9ef1606fa34ce7e000504db416 /package/madwifi/patches/389-autochannel.patch
parent05ea87a13ff744ea8a360caead70292f1311d91f (diff)
downloadupstream-130413bb0f1de803e52cd168c59373b3e6473f4e.tar.gz
upstream-130413bb0f1de803e52cd168c59373b3e6473f4e.tar.bz2
upstream-130413bb0f1de803e52cd168c59373b3e6473f4e.zip
madwifi: fix the autochannel patch
SVN-Revision: 13520
Diffstat (limited to 'package/madwifi/patches/389-autochannel.patch')
-rw-r--r--package/madwifi/patches/389-autochannel.patch9
1 files changed, 6 insertions, 3 deletions
diff --git a/package/madwifi/patches/389-autochannel.patch b/package/madwifi/patches/389-autochannel.patch
index 8e5a62dafc..9c77b0e543 100644
--- a/package/madwifi/patches/389-autochannel.patch
+++ b/package/madwifi/patches/389-autochannel.patch
@@ -16,7 +16,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)) {
-@@ -2913,6 +2915,34 @@ ath_hw_check_atim(struct ath_softc *sc,
+@@ -2913,6 +2915,37 @@ ath_hw_check_atim(struct ath_softc *sc,
}
@@ -33,6 +33,9 @@
+ if (sc->sc_ah->ah_macType < 5212)
+ return;
+
++ if (!ic->ic_curchan || (ic->ic_curchan == IEEE80211_CHAN_ANYC))
++ return;
++
+ rx = OS_REG_READ(ah, AR5K_RXCLEAR);
+ cc = OS_REG_READ(ah, AR5K_CYCLES);
+ if (rx > cc)
@@ -51,7 +54,7 @@
/*
* Reset the hardware w/o losing operational state. This is
* basically a more efficient way of doing ath_stop, ath_init,
-@@ -2939,6 +2969,7 @@ ath_reset(struct net_device *dev)
+@@ -2939,6 +2972,7 @@ ath_reset(struct net_device *dev)
* Convert to a HAL channel description with the flags
* constrained to reflect the current operating mode.
*/
@@ -59,7 +62,7 @@
c = ic->ic_curchan;
sc->sc_curchan.channel = c->ic_freq;
sc->sc_curchan.channelFlags = ath_chan2flags(c);
-@@ -9019,6 +9050,7 @@ ath_chan_set(struct ath_softc *sc, struc
+@@ -9019,6 +9053,7 @@ ath_chan_set(struct ath_softc *sc, struc
u_int8_t channel_change_required = 0;
struct timeval tv;