From 3ef2b9613d91bc3e8a825fe8ceaf38a76f628cbf Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 7 Dec 2018 14:59:46 -0800 Subject: [PATCH] qcacmn: Refine struct wmi_unified_pmk_cache (phase 2) 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 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 phase 2 replace the reference to session_id with a reference to vdev_id in send_set_del_pmkid_cache_cmd_tlv(). Change-Id: Ie8cc453751b95c332e3df32794506a4bd3c324ad CRs-Fixed: 2363431 --- wmi/src/wmi_unified_sta_tlv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wmi/src/wmi_unified_sta_tlv.c b/wmi/src/wmi_unified_sta_tlv.c index 8afcc08943..ba5a296b2c 100644 --- a/wmi/src/wmi_unified_sta_tlv.c +++ b/wmi/src/wmi_unified_sta_tlv.c @@ -1586,7 +1586,7 @@ static QDF_STATUS send_set_del_pmkid_cache_cmd_tlv(wmi_unified_t wmi_handle, WMITLV_GET_STRUCT_TLVLEN( wmi_pdev_update_pmk_cache_cmd_fixed_param)); - cmd->vdev_id = pmk_info->session_id; + cmd->vdev_id = pmk_info->vdev_id; /* If pmk_info->pmk_len is 0, this is a flush request */ if (!pmk_info->pmk_len) {