diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-04-20 23:36:57 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 22:57:18 +0200 |
| commit | b097ad29752f909ec1121ac3dc57d348f08dd8d7 (patch) | |
| tree | 4b5e4b302771c74a8771199112c54f4e6b3144bc /drivers/net/wireless/iwlwifi/iwl-scan.c | |
| parent | iwlwifi: improve scan support (diff) | |
| download | linux-b097ad29752f909ec1121ac3dc57d348f08dd8d7.tar.xz linux-b097ad29752f909ec1121ac3dc57d348f08dd8d7.zip | |
iwlwifi: support truly passive scanning
If passive scanning is requested we should not ask the
microcode to do active scanning after detecting traffic
on a channel -- that should only be used when an active
scan is requested but some channels are marked passive.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 9edcf8c76b20..25311e1ceed7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -712,7 +712,12 @@ static void iwl_bg_request_scan(struct work_struct *data) } else if (priv->scan_bands & BIT(IEEE80211_BAND_5GHZ)) { band = IEEE80211_BAND_5GHZ; rate = IWL_RATE_6M_PLCP; - scan->good_CRC_th = IWL_GOOD_CRC_TH; + /* + * If active scaning is requested but a certain channel + * is marked passive, we can do active scanning if we + * detect transmissions. + */ + scan->good_CRC_th = is_active ? IWL_GOOD_CRC_TH : 0; /* Force use of chains B and C (0x6) for scan Rx for 4965 * Avoid A (0x1) because of its off-channel reception on A-band. |