From 8eddfcf971bcc34068f50cec15887316a4c1bdde Mon Sep 17 00:00:00 2001 From: Rajasekaran Kalidoss Date: Tue, 1 Sep 2020 22:06:21 +0530 Subject: [PATCH] qcacld-3.0: Remove union of function pointers to handle cfi check failure sme_context structure uses union of TWT callback functions with different signatures. This causes a cfi check failure. Remove the union of callbacks and define them separately. CRs-Fixed: 2763856 Change-Id: Ic40a572e363ea13f2defe29e25a16e15c5bff06e --- core/sme/inc/sme_internal.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index 15e08f705857..a049a22499f6 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -405,14 +405,12 @@ struct sme_context { #endif /* FEATURE_FW_STATE */ tx_queue_cb tx_queue_cb; #ifdef WLAN_SUPPORT_TWT - union { - twt_enable_cb twt_enable_cb; - twt_disable_cb twt_disable_cb; - twt_add_dialog_cb twt_add_dialog_cb; - twt_del_dialog_cb twt_del_dialog_cb; - twt_pause_dialog_cb twt_pause_dialog_cb; - twt_resume_dialog_cb twt_resume_dialog_cb; - }; + twt_enable_cb twt_enable_cb; + twt_disable_cb twt_disable_cb; + twt_add_dialog_cb twt_add_dialog_cb; + twt_del_dialog_cb twt_del_dialog_cb; + twt_pause_dialog_cb twt_pause_dialog_cb; + twt_resume_dialog_cb twt_resume_dialog_cb; void *twt_context; #endif #ifdef FEATURE_WLAN_APF