From 622aad6d3d3399741d265180aef709e5d72a4b09 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 7 Dec 2018 15:05:37 -0800 Subject: [PATCH] qcacld-3.0: Use the refined struct wmi_unified_pmk_cache The original definition of struct wmi_unified_pmk_cache had several anomalies: 1) It contains an unnecessary tlv_header field. Only the fw-api structs should contain TLV headers. 2) It contains a mis-named session_id field. Common structures should use converged terminology, in this case vdev_id qca-wifi-host-cmn change If4be27111c604c16ea437aa654210cdff28220a7 ("qcacmn: Refine struct wmi_unified_pmk_cache (phase 1)") completely addressed the first issue, and as the first phase of fixing the second issue it replaced the session_id field with an anonymous union which contains both the existing session_id field and a new vdev_id field. Being part of a union these field will overlay each other. For the current phase replace the reference to session_id with a reference to vdev_id in sme_set_del_pmkid_cache(). Change-Id: Ief4bcb819cb3c842adb74904f2cb2483476eaeb9 CRs-Fixed: 2363433 --- core/sme/src/common/sme_api.c | 2 +- core/wma/src/wma_main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 5ea52dd9ab794..8b32930b806c3 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -15307,7 +15307,7 @@ QDF_STATUS sme_set_del_pmkid_cache(mac_handle_t mac_handle, uint8_t session_id, qdf_mem_set(pmk_cache, sizeof(*pmk_cache), 0); - pmk_cache->session_id = session_id; + pmk_cache->vdev_id = session_id; if (!pmk_cache_info) goto send_flush_cmd; diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index a10fc9bf04b88..be8a896d659da 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -8661,8 +8661,7 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg) qdf_mem_free(msg->bodyptr); break; case SIR_HAL_SET_DEL_PMKID_CACHE: - wma_set_del_pmkid_cache(wma_handle, - (struct wmi_unified_pmk_cache *) msg->bodyptr); + wma_set_del_pmkid_cache(wma_handle, msg->bodyptr); qdf_mem_free(msg->bodyptr); break; case SIR_HAL_HLP_IE_INFO: