From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 29 Mar 2009 05:28:50 +0000 (+0000)
Subject: madwifi: improve turbo/autochannel patch
X-Git-Tag: fast2504n-3.10.28-merged~16243
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=4abd754c5cdeba5ae9f03ff48945527fb9e2ed91;p=openwrt.git

madwifi: improve turbo/autochannel patch

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15067 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/madwifi/patches/418-turbo.patch b/package/madwifi/patches/418-turbo.patch
index ec0b49182d..4e13f90d20 100644
--- a/package/madwifi/patches/418-turbo.patch
+++ b/package/madwifi/patches/418-turbo.patch
@@ -1,11 +1,15 @@
 --- a/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;
  		if (c->ic_scanflags & IEEE80211_NOSCAN_SET)
  			continue;
 -		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) !=
  			 (modeflags & IEEE80211_CHAN_ALLTURBO)))
  			continue;