summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/conf.h
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2011-06-09 22:07:05 +0530
committerVinod Koul <vinod.koul@intel.com>2011-06-09 22:07:05 +0530
commit4b28d81a7ed82b906f1fdec0133d597b9cf57f85 (patch)
treefc722c2bafb704c0db35599392d8f8dddbb4e36d /drivers/net/wireless/wl12xx/conf.h
parent114df7d66efd5c23561782f38e97c48fb30d4f5d (diff)
parent626a96db11698119a67eeda130488e869aa6f14e (diff)
downloadtalos-obmc-linux-4b28d81a7ed82b906f1fdec0133d597b9cf57f85.tar.gz
talos-obmc-linux-4b28d81a7ed82b906f1fdec0133d597b9cf57f85.zip
Merge remote branch 'gpio/ep93xx-dma' into next
Diffstat (limited to 'drivers/net/wireless/wl12xx/conf.h')
-rw-r--r--drivers/net/wireless/wl12xx/conf.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h
index 1ab6c86aac40..c83fefb6662f 100644
--- a/drivers/net/wireless/wl12xx/conf.h
+++ b/drivers/net/wireless/wl12xx/conf.h
@@ -1157,6 +1157,9 @@ struct conf_sched_scan_settings {
/* time to wait on the channel for passive scans (in TUs) */
u32 dwell_time_passive;
+ /* time to wait on the channel for DFS scans (in TUs) */
+ u32 dwell_time_dfs;
+
/* number of probe requests to send on each channel in active scans */
u8 num_probe_reqs;
OpenPOWER on IntegriCloud