aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ti/wl18xx
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2012-11-26 18:05:40 +0200
committerLuciano Coelho <coelho@ti.com>2012-11-28 11:45:42 +0200
commit7c482c1040ae54e89a8fd4d6415577070d5a915d (patch)
treef95c28757cb6335030fb06f5154f23c8478cb6d6 /drivers/net/wireless/ti/wl18xx
parent6507babab4f7fe6c51c20abedd66d7449b7a9aca (diff)
downloadvexpress-lsk-7c482c1040ae54e89a8fd4d6415577070d5a915d.tar.gz
wlcore: configure dwell times according to scan type
Allow configuring different dwell times to the different scan types (regular and scheduled). Add new configuration entry (dwell_time_dfs) to conf_scan_settings, in order to allow setting different values for normal scan and scheduled scan. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Arik Nemtsov <arik@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/ti/wl18xx')
-rw-r--r--drivers/net/wireless/ti/wl18xx/main.c4
-rw-r--r--drivers/net/wireless/ti/wl18xx/scan.c6
-rw-r--r--drivers/net/wireless/ti/wl18xx/scan.h7
3 files changed, 6 insertions, 11 deletions
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index bb67d701f8a..c015231d295 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -394,8 +394,8 @@ static struct wlcore_conf wl18xx_conf = {
.scan = {
.min_dwell_time_active = 7500,
.max_dwell_time_active = 30000,
- .min_dwell_time_passive = 100000,
- .max_dwell_time_passive = 100000,
+ .dwell_time_passive = 100000,
+ .dwell_time_dfs = 150000,
.num_probe_reqs = 2,
.split_scan_timeout = 50000,
},
diff --git a/drivers/net/wireless/ti/wl18xx/scan.c b/drivers/net/wireless/ti/wl18xx/scan.c
index f31d0d480d1..daaebad78e1 100644
--- a/drivers/net/wireless/ti/wl18xx/scan.c
+++ b/drivers/net/wireless/ti/wl18xx/scan.c
@@ -84,7 +84,8 @@ static int wl18xx_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
}
wlcore_set_scan_chan_params(wl, cmd_channels, req->channels,
- req->n_channels, req->n_ssids);
+ req->n_channels, req->n_ssids,
+ SCAN_TYPE_SEARCH);
wl18xx_adjust_channels(cmd, cmd_channels);
/*
@@ -214,7 +215,8 @@ int wl18xx_scan_sched_scan_config(struct wl1271 *wl,
/* configure channels */
wlcore_set_scan_chan_params(wl, cmd_channels, req->channels,
- req->n_channels, req->n_ssids);
+ req->n_channels, req->n_ssids,
+ SCAN_TYPE_PERIODIC);
wl18xx_adjust_channels(cmd, cmd_channels);
cmd->short_cycles_sec = 0;
diff --git a/drivers/net/wireless/ti/wl18xx/scan.h b/drivers/net/wireless/ti/wl18xx/scan.h
index 0e026ecb311..5eb8c7fc156 100644
--- a/drivers/net/wireless/ti/wl18xx/scan.h
+++ b/drivers/net/wireless/ti/wl18xx/scan.h
@@ -35,13 +35,6 @@ struct tracking_ch_params {
u8 padding[2];
} __packed;
-enum
-{
- SCAN_TYPE_SEARCH = 0,
- SCAN_TYPE_PERIODIC = 1,
- SCAN_TYPE_TRACKING = 2,
-};
-
/* probe request rate */
enum
{