madwifi: improve turbo/autochannel patch

SVN-Revision: 15067
This commit is contained in:
Felix Fietkau 2009-03-29 05:28:50 +00:00
parent c614ca2b92
commit 8e58032107

View file

@ -1,11 +1,15 @@
--- a/net80211/ieee80211_scan.c --- a/net80211/ieee80211_scan.c
+++ b/net80211/ieee80211_scan.c +++ b/net80211/ieee80211_scan.c
@@ -1129,7 +1129,7 @@ ieee80211_scan_add_channels(struct ieee8 @@ -1129,7 +1129,11 @@ ieee80211_scan_add_channels(struct ieee8
continue; continue;
if (c->ic_scanflags & IEEE80211_NOSCAN_SET) if (c->ic_scanflags & IEEE80211_NOSCAN_SET)
continue; continue;
- if (modeflags && - if (modeflags &&
+ if ((modeflags || (ss->ss_vap->iv_opmode == IEEE80211_M_HOSTAP)) && + if (ss->ss_vap->iv_opmode == IEEE80211_M_HOSTAP) {
+ if ((c->ic_flags & (IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO)) !=
+ (modeflags & (IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO)))
+ continue;
+ } else if (modeflags &&
((c->ic_flags & IEEE80211_CHAN_ALLTURBO) != ((c->ic_flags & IEEE80211_CHAN_ALLTURBO) !=
(modeflags & IEEE80211_CHAN_ALLTURBO))) (modeflags & IEEE80211_CHAN_ALLTURBO)))
continue; continue;