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 {
 
 };
 
+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;
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 = {
                 .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,