From: proski <proski@0192ed92-7a03-0410-a25b-9323aeb14dbd>
Date: Thu, 25 Jun 2009 00:29:33 +0000 (+0000)
Subject: Use IEEE80211_IS_CHAN_PASSIVE - merge from DFS branch
X-Git-Url: http://git.ozo.com/?p=madwifi%2F.git;a=commitdiff_plain;h=a6137f861b3c9c342da06c45395cd4472f04d017;hp=d8b946207772354752d4bbc8a4280fc5b3d5d5a5

Use IEEE80211_IS_CHAN_PASSIVE - merge from DFS branch


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4048 0192ed92-7a03-0410-a25b-9323aeb14dbd
---

diff --git a/net80211/ieee80211_scan.c b/net80211/ieee80211_scan.c
index 4c586a5..9ed6c15 100644
--- a/net80211/ieee80211_scan.c
+++ b/net80211/ieee80211_scan.c
@@ -680,7 +680,7 @@ again:
 		        	channel_type(ic->ic_curchan),
 			ieee80211_chan2ieee(ic, chan), channel_type(chan),
 			(ss->ss_flags & IEEE80211_SCAN_ACTIVE) &&
-				(chan->ic_flags & IEEE80211_CHAN_PASSIVE) == 0 ?
+				  (!IEEE80211_IS_CHAN_PASSIVE(chan)) ?
 				"active" : "passive",
 			ss->ss_mindwell, maxdwell);
 
@@ -695,7 +695,7 @@ again:
 		 * Otherwise just listen for traffic on the channel.
 		 */
 		if ((ss->ss_flags & IEEE80211_SCAN_ACTIVE) &&
-		    (chan->ic_flags & IEEE80211_CHAN_PASSIVE) == 0) {
+		    !IEEE80211_IS_CHAN_PASSIVE(chan)) {
 			struct net_device *dev = vap->iv_dev;
 			/*
 			 * Send a broadcast probe request followed by