From 5f5bfc9775fbe45ae653a35354c8bd3e7c4a546e Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 22 Feb 2019 14:07:07 -0800 Subject: [PATCH] qcacmn: Replace session_id in hidden_ssid_vdev_restart_params In struct hidden_ssid_vdev_restart_params the legacy identifier session_id is currently used to identify the vdev of interest. To align with the converged nomenclature rename this to vdev_id. This is co-dependent with Ie8c426aff1a8a1e7f75199c8cf7c761f1a893a05 ("qcacld-3.0: Use vdev_id in hidden_ssid_vdev_restart_params"). Change-Id: Iea0bf0a3dcae9186cce4eb176b974515fd0d7624 CRs-Fixed: 2403934 --- wmi/inc/wmi_unified_param.h | 4 ++-- wmi/src/wmi_unified_tlv.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index cb4c7f6f812f..2118028878b1 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -842,7 +842,7 @@ struct vdev_nss_chains { /** * struct hidden_ssid_vdev_restart_params - * vdev restart cmd parameter - * @session_id: session id + * @vdev_id: ID of the vdev that needs to be restarted * @ssid_len: ssid length * @ssid: ssid * @flags: flags @@ -859,7 +859,7 @@ struct vdev_nss_chains { * flag to check if restart is in progress */ struct hidden_ssid_vdev_restart_params { - uint8_t session_id; + uint8_t vdev_id; uint32_t ssid_len; uint32_t ssid[8]; uint32_t flags; diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 4a424acba770..a3523588916c 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -602,7 +602,7 @@ static QDF_STATUS send_hidden_ssid_vdev_restart_cmd_tlv(wmi_unified_t wmi_handle WMITLV_TAG_STRUC_wmi_channel, WMITLV_GET_STRUCT_TLVLEN(wmi_channel)); - cmd->vdev_id = restart_params->session_id; + cmd->vdev_id = restart_params->vdev_id; cmd->ssid.ssid_len = restart_params->ssid_len; qdf_mem_copy(cmd->ssid.ssid, restart_params->ssid,