diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-03 14:31:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-03 14:31:50 -0400 |
| commit | 7b29dc21ea084be7ddfb536994a9cfae95337690 (patch) | |
| tree | 799f5becd9484e53e09b5f620ebfd5315bdfe033 /drivers/net/wireless/wl12xx/conf.h | |
| parent | 9a2e0fb0893ddf595d0a372e681f5b98017c6d90 (diff) | |
| parent | dfe21582ac5ebc460dda98c67e8589dd506d02cd (diff) | |
| download | linux-rpi-7b29dc21ea084be7ddfb536994a9cfae95337690.tar.gz linux-rpi-7b29dc21ea084be7ddfb536994a9cfae95337690.tar.bz2 linux-rpi-7b29dc21ea084be7ddfb536994a9cfae95337690.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
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 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; |