Browse Source

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
Rajasekaran Kalidoss 4 years ago
parent
commit
8eddfcf971
1 changed files with 6 additions and 8 deletions
  1. 6 8
      core/sme/inc/sme_internal.h

+ 6 - 8
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