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
This commit is contained in:
proski 2009-06-25 00:29:33 +00:00
parent d8b9462077
commit a6137f861b

View File

@ -680,7 +680,7 @@ again:
channel_type(ic->ic_curchan), channel_type(ic->ic_curchan),
ieee80211_chan2ieee(ic, chan), channel_type(chan), ieee80211_chan2ieee(ic, chan), channel_type(chan),
(ss->ss_flags & IEEE80211_SCAN_ACTIVE) && (ss->ss_flags & IEEE80211_SCAN_ACTIVE) &&
(chan->ic_flags & IEEE80211_CHAN_PASSIVE) == 0 ? (!IEEE80211_IS_CHAN_PASSIVE(chan)) ?
"active" : "passive", "active" : "passive",
ss->ss_mindwell, maxdwell); ss->ss_mindwell, maxdwell);
@ -695,7 +695,7 @@ again:
* Otherwise just listen for traffic on the channel. * Otherwise just listen for traffic on the channel.
*/ */
if ((ss->ss_flags & IEEE80211_SCAN_ACTIVE) && 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; struct net_device *dev = vap->iv_dev;
/* /*
* Send a broadcast probe request followed by * Send a broadcast probe request followed by