ath11k: Add 6G scan dwell time parameter in scan request command

Add 6G scan active and passive dwell time parameter to scan request.

Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200603001724.12161-7-pradeepc@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index a6bbb3badd1f946338c2188f3405e4327c15d00f..239a336f55f41ed314439c578484663ff5d9653d 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -1899,6 +1899,8 @@ void ath11k_wmi_start_scan_init(struct ath11k *ar,
        arg->dwell_time_active = 50;
        arg->dwell_time_active_2g = 0;
        arg->dwell_time_passive = 150;
+       arg->dwell_time_active_6g = 40;
+       arg->dwell_time_passive_6g = 30;
        arg->min_rest_time = 50;
        arg->max_rest_time = 500;
        arg->repeat_probe_time = 0;
@@ -2045,6 +2047,8 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,
        cmd->dwell_time_active = params->dwell_time_active;
        cmd->dwell_time_active_2g = params->dwell_time_active_2g;
        cmd->dwell_time_passive = params->dwell_time_passive;
+       cmd->dwell_time_active_6g = params->dwell_time_active_6g;
+       cmd->dwell_time_passive_6g = params->dwell_time_passive_6g;
        cmd->min_rest_time = params->min_rest_time;
        cmd->max_rest_time = params->max_rest_time;
        cmd->repeat_probe_time = params->repeat_probe_time;

diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index 76c2da2c5db7edf1c662fb9dc7da0e7119aea6e5..4937d02839fcb4996925f35430bee77c9d500055 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -3061,6 +3061,9 @@ struct  wmi_start_scan_cmd {
        u32 num_vendor_oui;
        u32 scan_ctrl_flags_ext;
        u32 dwell_time_active_2g;
+       u32 dwell_time_active_6g;
+       u32 dwell_time_passive_6g;
+       u32 scan_start_offset;
 } __packed;
 
 #define WMI_SCAN_FLAG_PASSIVE        0x1
@@ -3127,6 +3130,8 @@ struct scan_req_params {
        u32 dwell_time_active;
        u32 dwell_time_active_2g;
        u32 dwell_time_passive;
+       u32 dwell_time_active_6g;
+       u32 dwell_time_passive_6g;
        u32 min_rest_time;
        u32 max_rest_time;
        u32 repeat_probe_time;