aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/wl12xx/scan.c')
-rw-r--r--drivers/net/wireless/wl12xx/scan.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
index 8ccbb911776a..28ec0addc657 100644
--- a/drivers/net/wireless/wl12xx/scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
@@ -352,9 +352,12 @@ wl1271_scan_get_sched_scan_channels(struct wl1271 *wl,
352 wl1271_debug(DEBUG_SCAN, "max_power %d", 352 wl1271_debug(DEBUG_SCAN, "max_power %d",
353 req->channels[i]->max_power); 353 req->channels[i]->max_power);
354 354
355 if (flags & IEEE80211_CHAN_RADAR) 355 if (flags & IEEE80211_CHAN_RADAR) {
356 channels[j].flags |= SCAN_CHANNEL_FLAGS_DFS; 356 channels[j].flags |= SCAN_CHANNEL_FLAGS_DFS;
357 if (flags & IEEE80211_CHAN_PASSIVE_SCAN) { 357 channels[j].passive_duration =
358 cpu_to_le16(c->dwell_time_dfs);
359 }
360 else if (flags & IEEE80211_CHAN_PASSIVE_SCAN) {
358 channels[j].passive_duration = 361 channels[j].passive_duration =
359 cpu_to_le16(c->dwell_time_passive); 362 cpu_to_le16(c->dwell_time_passive);
360 } else { 363 } else {