diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-07 14:07:11 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-07 14:07:11 -0400 |
| commit | 41bfce8edebbe9dc6ddc238a71f07fbe9ab46016 (patch) | |
| tree | 31e1799bdb73dd5b7bc5aea367cc6fead035e396 /drivers/net/wireless/wl12xx/conf.h | |
| parent | 805a3b810708db3261cc8c1183ffb2703a5ce243 (diff) | |
| parent | 51892dbbd511911c0f965a36b431fc3e8f1e4f8a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/conf.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/conf.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h index 1ab6c86aac4..c83fefb6662 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; |