diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-06 08:08:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-06 08:08:38 -0700 |
| commit | 163baa33552bb1c08b6bf109319505570658a8f3 (patch) | |
| tree | db130209cf27ec72ecd5a7121a3c91543badc8f3 /drivers/net/wireless/wl12xx/main.c | |
| parent | 8250_pci: add -ENODEV code for Intel EG20T PCH (diff) | |
| parent | Linux 3.0-rc2 (diff) | |
| download | linux-dev-163baa33552bb1c08b6bf109319505570658a8f3.tar.xz linux-dev-163baa33552bb1c08b6bf109319505570658a8f3.zip | |
Merge 3.0-rc2 into tty-linus
This is needed to catch the tty patch revert in the 3.0-rc2 tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/wireless/wl12xx/main.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index bc00e52f6445..e6497dc669df 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -311,6 +311,7 @@ static struct conf_drv_settings default_conf = { .min_dwell_time_active = 8, .max_dwell_time_active = 30, .dwell_time_passive = 100, + .dwell_time_dfs = 150, .num_probe_reqs = 2, .rssi_threshold = -90, .snr_threshold = 0, |