From 5f1a994b1d56c8bddc4ac76da17acbf8d8ef4c25 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Fri, 6 Sep 2019 16:04:37 +0530 Subject: [PATCH] qcacmn: Remove unused hidden ssid vdev restart command Remove unused func and structures for hidden ssid vdev restart. Change-Id: Ia22c7676ce582e2b554ff845c11641a6ef9d3013 CRs-Fixed: 2522560 --- wmi/inc/wmi_unified_api.h | 12 ------ wmi/inc/wmi_unified_param.h | 34 ----------------- wmi/inc/wmi_unified_priv.h | 3 -- wmi/src/wmi_unified_api.c | 12 ------ wmi/src/wmi_unified_tlv.c | 73 ------------------------------------- 5 files changed, 134 deletions(-) diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h index 47a36c61ef..dcf29043e8 100644 --- a/wmi/inc/wmi_unified_api.h +++ b/wmi/inc/wmi_unified_api.h @@ -581,18 +581,6 @@ QDF_STATUS wmi_unified_vdev_set_nac_rssi_send(wmi_unified_t wmi_handle, struct vdev_scan_nac_rssi_params *req); -/** - * wmi_unified_hidden_ssid_vdev_restart_send() - restart vdev to set hidden ssid - * @wmi_handle: wmi handle - * @restart_params: vdev restart params - * - * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure - */ -QDF_STATUS -wmi_unified_hidden_ssid_vdev_restart_send( - wmi_unified_t wmi_handle, - struct hidden_ssid_vdev_restart_params *restart_params); - /** * wmi_unified_vdev_set_param_send() - WMI vdev set parameter function * @wmi_handle: handle to WMI. diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 4cadee25b4..4b2ad7aa1a 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -708,40 +708,6 @@ struct vdev_nss_chains { bool disable_tx_mrc[NSS_CHAINS_BAND_MAX]; }; -/** - * struct hidden_ssid_vdev_restart_params - - * vdev restart cmd parameter - * @vdev_id: ID of the vdev that needs to be restarted - * @ssid_len: ssid length - * @ssid: ssid - * @flags: flags - * @requestor_id: requestor id - * @disable_hw_ack: flag to disable hw ack feature - * @mhz: channel frequency - * @band_center_freq1: center freq 1 - * @band_center_freq2: center freq 2 - * @info: channel info - * @reg_info_1: contains min power, max power, - * reg power and reg class id - * @reg_info_2: contains antennamax - * @hidden_ssid_restart_in_progress: - * flag to check if restart is in progress - */ -struct hidden_ssid_vdev_restart_params { - uint8_t vdev_id; - uint32_t ssid_len; - uint32_t ssid[8]; - uint32_t flags; - uint32_t requestor_id; - uint32_t disable_hw_ack; - uint32_t mhz; - uint32_t band_center_freq1; - uint32_t band_center_freq2; - uint32_t info; - uint32_t reg_info_1; - uint32_t reg_info_2; -}; - #ifdef WLAN_CFR_ENABLE #define WMI_HOST_PEER_CFR_TIMER_ENABLE 1 diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index f8478332cd..2f2debf6f8 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -288,9 +288,6 @@ QDF_STATUS (*send_vdev_start_cmd)(wmi_unified_t wmi, QDF_STATUS (*send_vdev_set_nac_rssi_cmd)(wmi_unified_t wmi, struct vdev_scan_nac_rssi_params *req); -QDF_STATUS (*send_hidden_ssid_vdev_restart_cmd)(wmi_unified_t wmi_handle, - struct hidden_ssid_vdev_restart_params *restart_params); - QDF_STATUS (*send_peer_flush_tids_cmd)(wmi_unified_t wmi, uint8_t peer_addr[QDF_MAC_ADDR_SIZE], struct peer_flush_params *param); diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c index ecd65c4b36..17053b238c 100644 --- a/wmi/src/wmi_unified_api.c +++ b/wmi/src/wmi_unified_api.c @@ -138,18 +138,6 @@ wmi_unified_vdev_set_nac_rssi_send(wmi_unified_t wmi_handle, return QDF_STATUS_E_FAILURE; } -QDF_STATUS -wmi_unified_hidden_ssid_vdev_restart_send( - wmi_unified_t wmi_handle, - struct hidden_ssid_vdev_restart_params *restart_params) -{ - if (wmi_handle->ops->send_hidden_ssid_vdev_restart_cmd) - return wmi_handle->ops->send_hidden_ssid_vdev_restart_cmd( - wmi_handle, restart_params); - - return QDF_STATUS_E_FAILURE; -} - QDF_STATUS wmi_unified_peer_flush_tids_send(wmi_unified_t wmi_handle, uint8_t peer_addr[QDF_MAC_ADDR_SIZE], diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 93dcbf3a96..0789d94ad3 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -946,77 +946,6 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle, return QDF_STATUS_SUCCESS; } -/** - * send_hidden_ssid_vdev_restart_cmd_tlv() - restart vdev to set hidden ssid - * @wmi_handle: wmi handle - * @restart_params: vdev restart params - * - * Return: QDF_STATUS_SUCCESS for success or error code - */ -static QDF_STATUS send_hidden_ssid_vdev_restart_cmd_tlv(wmi_unified_t wmi_handle, - struct hidden_ssid_vdev_restart_params *restart_params) -{ - wmi_vdev_start_request_cmd_fixed_param *cmd; - wmi_buf_t buf; - wmi_channel *chan; - int32_t len; - uint8_t *buf_ptr; - QDF_STATUS ret = 0; - - len = sizeof(*cmd) + sizeof(wmi_channel) + WMI_TLV_HDR_SIZE; - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) - return QDF_STATUS_E_NOMEM; - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_vdev_start_request_cmd_fixed_param *) buf_ptr; - chan = (wmi_channel *) (buf_ptr + sizeof(*cmd)); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_start_request_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_start_request_cmd_fixed_param)); - - WMITLV_SET_HDR(&chan->tlv_header, - WMITLV_TAG_STRUC_wmi_channel, - WMITLV_GET_STRUCT_TLVLEN(wmi_channel)); - - cmd->vdev_id = restart_params->vdev_id; - cmd->ssid.ssid_len = restart_params->ssid_len; - qdf_mem_copy(cmd->ssid.ssid, - restart_params->ssid, - cmd->ssid.ssid_len); - cmd->flags = restart_params->flags; - cmd->requestor_id = restart_params->requestor_id; - cmd->disable_hw_ack = restart_params->disable_hw_ack; - - chan->mhz = restart_params->mhz; - chan->band_center_freq1 = - restart_params->band_center_freq1; - chan->band_center_freq2 = - restart_params->band_center_freq2; - chan->info = restart_params->info; - chan->reg_info_1 = restart_params->reg_info_1; - chan->reg_info_2 = restart_params->reg_info_2; - - cmd->num_noa_descriptors = 0; - buf_ptr = (uint8_t *) (((uint8_t *) cmd) + sizeof(*cmd) + - sizeof(wmi_channel)); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - cmd->num_noa_descriptors * - sizeof(wmi_p2p_noa_descriptor)); - - wmi_mtrace(WMI_VDEV_RESTART_REQUEST_CMDID, cmd->vdev_id, 0); - ret = wmi_unified_cmd_send(wmi_handle, buf, len, - WMI_VDEV_RESTART_REQUEST_CMDID); - if (QDF_IS_STATUS_ERROR(ret)) { - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; -} - - /** * send_peer_flush_tids_cmd_tlv() - flush peer tids packets in fw * @wmi: wmi handle @@ -11805,8 +11734,6 @@ struct wmi_ops tlv_ops = { .send_vdev_nss_chain_params_cmd = send_vdev_nss_chain_params_cmd_tlv, .send_vdev_down_cmd = send_vdev_down_cmd_tlv, .send_vdev_start_cmd = send_vdev_start_cmd_tlv, - .send_hidden_ssid_vdev_restart_cmd = - send_hidden_ssid_vdev_restart_cmd_tlv, .send_peer_flush_tids_cmd = send_peer_flush_tids_cmd_tlv, .send_peer_param_cmd = send_peer_param_cmd_tlv, .send_vdev_up_cmd = send_vdev_up_cmd_tlv,