wl1271: Optimize scan duration

[pandora-kernel.git] / drivers / net / wireless / wl12xx / wl1271_conf.h

diff --git a/drivers/net/wireless/wl12xx/wl1271_conf.h b/drivers/net/wireless/wl12xx/wl1271_conf.h
index d046d04..ab716f5 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_conf.h
+++ b/drivers/net/wireless/wl12xx/wl1271_conf.h
@@ -595,7 +595,7 @@ struct conf_tx_ac_category {
        u16 tx_op_limit;
 };
 
-#define CONF_TX_MAX_TID_COUNT 7
+#define CONF_TX_MAX_TID_COUNT 8
 
 enum {
        CONF_CHANNEL_TYPE_DCF = 0,   /* DC/LEGACY*/
@@ -873,6 +873,13 @@ struct conf_conn_settings {
         */
        u8 ps_poll_threshold;
 
+       /*
+        * PS Poll failure recovery ACTIVE period length
+        *
+        * Range: u32 (ms)
+        */
+       u32 ps_poll_recovery_period;
+
        /*
         * Configuration of signal average weights.
         */
@@ -948,14 +955,6 @@ struct conf_radio_parms {
        u8 fem;
 };
 
-struct conf_init_settings {
-       /*
-        * Configure radio parameters.
-        */
-       struct conf_radio_parms radioparam;
-
-};
-
 struct conf_itrim_settings {
        /* enable dco itrim */
        u8 enable;
@@ -1017,15 +1016,53 @@ struct conf_roam_trigger_settings {
        u8 avg_weight_snr_data;
 };
 
+struct conf_scan_settings {
+       /*
+        * The minimum time to wait on each channel for active scans
+        *
+        * Range: 0 - 65536 tu
+        */
+       u16 min_dwell_time_active;
+
+       /*
+        * The maximum time to wait on each channel for active scans
+        *
+        * Range: 0 - 65536 tu
+        */
+       u16 max_dwell_time_active;
+
+       /*
+        * The maximum time to wait on each channel for passive scans
+        *
+        * Range: 0 - 65536 tu
+        */
+       u16 min_dwell_time_passive;
+
+       /*
+        * The maximum time to wait on each channel for passive scans
+        *
+        * Range: 0 - 65536 tu
+        */
+       u16 max_dwell_time_passive;
+
+       /*
+        * Number of probe requests to transmit on each active scan channel
+        *
+        * Range: u8
+        */
+       u16 num_probe_reqs;
+
+};
+
 struct conf_drv_settings {
        struct conf_sg_settings sg;
        struct conf_rx_settings rx;
        struct conf_tx_settings tx;
        struct conf_conn_settings conn;
-       struct conf_init_settings init;
        struct conf_itrim_settings itrim;
        struct conf_pm_config_settings pm_config;
        struct conf_roam_trigger_settings roam_trigger;
+       struct conf_scan_settings scan;
 };
 
 #endif