diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h index 19e931072a..a377fe95e0 100644 --- a/wmi/inc/wmi_unified_api.h +++ b/wmi/inc/wmi_unified_api.h @@ -778,9 +778,6 @@ QDF_STATUS wmi_unified_enable_specific_fw_logs_cmd(void *wmi_hdl, QDF_STATUS wmi_unified_flush_logs_to_fw_cmd(void *wmi_hdl); -QDF_STATUS wmi_unified_set_ssid_hotlist_cmd(void *wmi_hdl, - struct ssid_hotlist_request_params *request); - QDF_STATUS wmi_unified_unit_test_cmd(void *wmi_hdl, struct wmi_unit_test_cmd *wmi_utest); diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 97ca275752..0afa237a67 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -2819,37 +2819,6 @@ struct wmi_hw_mode_params { uint8_t agile_dfs_cap; }; -/** - * struct ssid_hotlist_param - param for SSID Hotlist - * @ssid: SSID which is being hotlisted - * @band: Band in which the given SSID should be scanned - * @rssi_low: Low bound on RSSI - * @rssi_high: High bound on RSSI - */ -struct ssid_hotlist_param { - struct mac_ssid ssid; - uint8_t band; - int32_t rssi_low; - int32_t rssi_high; -}; - -/** - * struct ssid_hotlist_request_params - set SSID hotlist request struct - * @request_id: ID of the request - * @session_id: ID of the session - * @lost_ssid_sample_size: Number of consecutive scans in which the SSID - * must not be seen in order to consider the SSID "lost" - * @ssid_count: Number of valid entries in the @ssids array - * @ssids: Array that defines the SSIDs that are in the hotlist - */ -struct ssid_hotlist_request_params { - uint32_t request_id; - uint8_t session_id; - uint32_t lost_ssid_sample_size; - uint32_t ssid_count; - struct ssid_hotlist_param ssids[WMI_EXTSCAN_MAX_HOTLIST_SSIDS]; -}; - /** * struct wmi_unit_test_cmd - unit test command parameters * @vdev_id: vdev id diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index 8f355c13d6..be4052d8d7 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -988,9 +988,6 @@ QDF_STATUS (*send_enable_specific_fw_logs_cmd)(wmi_unified_t wmi_handle, QDF_STATUS (*send_flush_logs_to_fw_cmd)(wmi_unified_t wmi_handle); -QDF_STATUS (*send_set_ssid_hotlist_cmd)(wmi_unified_t wmi_handle, - struct ssid_hotlist_request_params *request); - QDF_STATUS (*send_unit_test_cmd)(wmi_unified_t wmi_handle, struct wmi_unit_test_cmd *wmi_utest); diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c index fb6fe11c7d..77ee10d745 100644 --- a/wmi/src/wmi_unified_api.c +++ b/wmi/src/wmi_unified_api.c @@ -1739,26 +1739,6 @@ QDF_STATUS wmi_unified_flush_logs_to_fw_cmd(void *wmi_hdl) return QDF_STATUS_E_FAILURE; } -/** - * wmi_unified_set_ssid_hotlist_cmd() - Handle an SSID hotlist set request - * @wmi_hdl: wmi handle - * @request: SSID hotlist set request - * - * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure - */ -QDF_STATUS -wmi_unified_set_ssid_hotlist_cmd(void *wmi_hdl, - struct ssid_hotlist_request_params *request) -{ - wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; - - if (wmi_handle->ops->send_set_ssid_hotlist_cmd) - return wmi_handle->ops->send_set_ssid_hotlist_cmd(wmi_handle, - request); - - return QDF_STATUS_E_FAILURE; -} - /** * wmi_unified_fw_test_cmd() - send fw test command to fw. * @wmi_hdl: wmi handle diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 98682872f3..8cb08dc619 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -7080,97 +7080,6 @@ send_pdev_fips_cmd_tlv(wmi_unified_t wmi_handle, return retval; } -/** - * send_set_ssid_hotlist_cmd_tlv() - Handle an SSID hotlist set request - * @wmi_handle: wmi handle - * @request: SSID hotlist set request - * - * Return: QDF_STATUS enumeration - */ -static QDF_STATUS -send_set_ssid_hotlist_cmd_tlv(wmi_unified_t wmi_handle, - struct ssid_hotlist_request_params *request) -{ - wmi_extscan_configure_hotlist_ssid_monitor_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t len; - uint32_t array_size; - uint8_t *buf_ptr; - - /* length of fixed portion */ - len = sizeof(*cmd); - - /* length of variable portion */ - array_size = - request->ssid_count * sizeof(wmi_extscan_hotlist_ssid_entry); - len += WMI_TLV_HDR_SIZE + array_size; - - wmi_buf = wmi_buf_alloc(wmi_handle, len); - if (!wmi_buf) { - WMI_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - cmd = (wmi_extscan_configure_hotlist_ssid_monitor_cmd_fixed_param *) - buf_ptr; - WMITLV_SET_HDR - (&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_extscan_configure_hotlist_ssid_monitor_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extscan_configure_hotlist_ssid_monitor_cmd_fixed_param)); - - cmd->request_id = request->request_id; - cmd->requestor_id = 0; - cmd->vdev_id = request->session_id; - cmd->table_id = 0; - cmd->lost_ap_scan_count = request->lost_ssid_sample_size; - cmd->total_entries = request->ssid_count; - cmd->num_entries_in_page = request->ssid_count; - cmd->first_entry_index = 0; - - buf_ptr += sizeof(*cmd); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, array_size); - - if (request->ssid_count) { - wmi_extscan_hotlist_ssid_entry *entry; - int i; - - buf_ptr += WMI_TLV_HDR_SIZE; - entry = (wmi_extscan_hotlist_ssid_entry *)buf_ptr; - for (i = 0; i < request->ssid_count; i++) { - WMITLV_SET_HDR - (entry, - WMITLV_TAG_ARRAY_STRUC, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extscan_hotlist_ssid_entry)); - entry->ssid.ssid_len = request->ssids[i].ssid.length; - qdf_mem_copy(entry->ssid.ssid, - request->ssids[i].ssid.mac_ssid, - request->ssids[i].ssid.length); - entry->band = request->ssids[i].band; - entry->min_rssi = request->ssids[i].rssi_low; - entry->max_rssi = request->ssids[i].rssi_high; - entry++; - } - cmd->mode = WMI_EXTSCAN_MODE_START; - } else { - cmd->mode = WMI_EXTSCAN_MODE_STOP; - } - - wmi_mtrace(WMI_EXTSCAN_CONFIGURE_HOTLIST_SSID_MONITOR_CMDID, - cmd->vdev_id, 0); - if (wmi_unified_cmd_send - (wmi_handle, wmi_buf, len, - WMI_EXTSCAN_CONFIGURE_HOTLIST_SSID_MONITOR_CMDID)) { - WMI_LOGE("%s: failed to send command", __func__); - wmi_buf_free(wmi_buf); - return QDF_STATUS_E_FAILURE; - } - - return QDF_STATUS_SUCCESS; -} - /** * send_fw_test_cmd_tlv() - send fw test command to fw. * @wmi_handle: wmi handle @@ -11331,7 +11240,6 @@ struct wmi_ops tlv_ops = { .send_enable_specific_fw_logs_cmd = send_enable_specific_fw_logs_cmd_tlv, .send_flush_logs_to_fw_cmd = send_flush_logs_to_fw_cmd_tlv, - .send_set_ssid_hotlist_cmd = send_set_ssid_hotlist_cmd_tlv, .send_unit_test_cmd = send_unit_test_cmd_tlv, #ifdef FEATURE_WLAN_APF .send_set_active_apf_mode_cmd = wmi_send_set_active_apf_mode_cmd_tlv,