wl12xx: add configuration values for scheduled scan
authorLuciano Coelho <coelho@ti.com>
Tue, 10 May 2011 11:06:31 +0000 (14:06 +0300)
committerLuciano Coelho <coelho@ti.com>
Thu, 12 May 2011 21:06:32 +0000 (00:06 +0300)
Add the structures and values for driver-configured scheduled scan
parameters.

Signed-off-by: Luciano Coelho <coelho@ti.com>
drivers/net/wireless/wl12xx/conf.h
drivers/net/wireless/wl12xx/main.c

index 1f947368f9ee61f60ee86a637797f84db586a226..ba558fcc76d0502f68adc677185d64028487b903 100644 (file)
@@ -1147,6 +1147,26 @@ struct conf_scan_settings {
 
 };
 
+struct conf_sched_scan_settings {
+       /* minimum time to wait on the channel for active scans (in TUs) */
+       u16 min_dwell_time_active;
+
+       /* maximum time to wait on the channel for active scans (in TUs) */
+       u16 max_dwell_time_active;
+
+       /* time to wait on the channel for passive scans (in TUs) */
+       u32 dwell_time_passive;
+
+       /* number of probe requests to send on each channel in active scans */
+       u8 num_probe_reqs;
+
+       /* RSSI threshold to be used for filtering */
+       s8 rssi_threshold;
+
+       /* SNR threshold to be used for filtering */
+       s8 snr_threshold;
+};
+
 /* these are number of channels on the band divided by two, rounded up */
 #define CONF_TX_PWR_COMPENSATION_LEN_2 7
 #define CONF_TX_PWR_COMPENSATION_LEN_5 18
@@ -1234,6 +1254,7 @@ struct conf_drv_settings {
        struct conf_pm_config_settings pm_config;
        struct conf_roam_trigger_settings roam_trigger;
        struct conf_scan_settings scan;
+       struct conf_sched_scan_settings sched_scan;
        struct conf_rf_settings rf;
        struct conf_ht_setting ht;
        struct conf_memory_settings mem_wl127x;
index acfbbfd3b7dd7c549aaba289a260833f4ece11ab..88d2e9052a0d9303387e0e9bc0f09598f5dbeda0 100644 (file)
@@ -306,6 +306,15 @@ static struct conf_drv_settings default_conf = {
                .max_dwell_time_passive       = 100000,
                .num_probe_reqs               = 2,
        },
+       .sched_scan = {
+               /* sched_scan requires dwell times in TU instead of TU/1000 */
+               .min_dwell_time_active = 8,
+               .max_dwell_time_active = 30,
+               .dwell_time_passive    = 100,
+               .num_probe_reqs        = 2,
+               .rssi_threshold        = -90,
+               .snr_threshold         = 0,
+       },
        .rf = {
                .tx_per_channel_power_compensation_2 = {
                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,