diff options
author | Luciano Coelho <coelho@ti.com> | 2011-05-10 07:06:31 -0400 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2011-05-12 17:06:32 -0400 |
commit | 3a9d60e5bd72f9533b05d39278fec50b181dbdd2 (patch) | |
tree | bff8549eb1081350aa8bc3a2b6c56318f2108d59 /drivers/net/wireless/wl12xx | |
parent | fcd23b6305e98f5ad3ddd7ff3f5081c75fcd4367 (diff) |
wl12xx: add configuration values for scheduled scan
Add the structures and values for driver-configured scheduled scan
parameters.
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r-- | drivers/net/wireless/wl12xx/conf.h | 21 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 9 |
2 files changed, 30 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h index 1f947368f9ee..ba558fcc76d0 100644 --- a/drivers/net/wireless/wl12xx/conf.h +++ b/drivers/net/wireless/wl12xx/conf.h | |||
@@ -1147,6 +1147,26 @@ struct conf_scan_settings { | |||
1147 | 1147 | ||
1148 | }; | 1148 | }; |
1149 | 1149 | ||
1150 | struct conf_sched_scan_settings { | ||
1151 | /* minimum time to wait on the channel for active scans (in TUs) */ | ||
1152 | u16 min_dwell_time_active; | ||
1153 | |||
1154 | /* maximum time to wait on the channel for active scans (in TUs) */ | ||
1155 | u16 max_dwell_time_active; | ||
1156 | |||
1157 | /* time to wait on the channel for passive scans (in TUs) */ | ||
1158 | u32 dwell_time_passive; | ||
1159 | |||
1160 | /* number of probe requests to send on each channel in active scans */ | ||
1161 | u8 num_probe_reqs; | ||
1162 | |||
1163 | /* RSSI threshold to be used for filtering */ | ||
1164 | s8 rssi_threshold; | ||
1165 | |||
1166 | /* SNR threshold to be used for filtering */ | ||
1167 | s8 snr_threshold; | ||
1168 | }; | ||
1169 | |||
1150 | /* these are number of channels on the band divided by two, rounded up */ | 1170 | /* these are number of channels on the band divided by two, rounded up */ |
1151 | #define CONF_TX_PWR_COMPENSATION_LEN_2 7 | 1171 | #define CONF_TX_PWR_COMPENSATION_LEN_2 7 |
1152 | #define CONF_TX_PWR_COMPENSATION_LEN_5 18 | 1172 | #define CONF_TX_PWR_COMPENSATION_LEN_5 18 |
@@ -1234,6 +1254,7 @@ struct conf_drv_settings { | |||
1234 | struct conf_pm_config_settings pm_config; | 1254 | struct conf_pm_config_settings pm_config; |
1235 | struct conf_roam_trigger_settings roam_trigger; | 1255 | struct conf_roam_trigger_settings roam_trigger; |
1236 | struct conf_scan_settings scan; | 1256 | struct conf_scan_settings scan; |
1257 | struct conf_sched_scan_settings sched_scan; | ||
1237 | struct conf_rf_settings rf; | 1258 | struct conf_rf_settings rf; |
1238 | struct conf_ht_setting ht; | 1259 | struct conf_ht_setting ht; |
1239 | struct conf_memory_settings mem_wl127x; | 1260 | struct conf_memory_settings mem_wl127x; |
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index acfbbfd3b7dd..88d2e9052a0d 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -306,6 +306,15 @@ static struct conf_drv_settings default_conf = { | |||
306 | .max_dwell_time_passive = 100000, | 306 | .max_dwell_time_passive = 100000, |
307 | .num_probe_reqs = 2, | 307 | .num_probe_reqs = 2, |
308 | }, | 308 | }, |
309 | .sched_scan = { | ||
310 | /* sched_scan requires dwell times in TU instead of TU/1000 */ | ||
311 | .min_dwell_time_active = 8, | ||
312 | .max_dwell_time_active = 30, | ||
313 | .dwell_time_passive = 100, | ||
314 | .num_probe_reqs = 2, | ||
315 | .rssi_threshold = -90, | ||
316 | .snr_threshold = 0, | ||
317 | }, | ||
309 | .rf = { | 318 | .rf = { |
310 | .tx_per_channel_power_compensation_2 = { | 319 | .tx_per_channel_power_compensation_2 = { |
311 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 320 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |