qcacld-3.0: Add feature flags for DISA functions

Add feature flags for DISA functionality in SME and WMA layers

Change-Id: I9fe33083469a2169cd06206e85d7965405d4a728
CRs-Fixed: 1076941
(cherry picked from commit 3c85d965eec08da145a26fc2ceefdaf8dcfb4df0)

5 files changed, 23 insertions, 0 deletions

diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h
index ce4bdac75066..3990ebab984b 100644
--- a/core/sme/inc/sme_api.h
+++ b/core/sme/inc/sme_api.h
@@ -1277,6 +1277,7 @@ QDF_STATUS sme_set_default_scan_ie(tHalHandle hal, uint16_t session_id,
 QDF_STATUS sme_update_session_param(tHalHandle hal, uint8_t session_id,
 		uint32_t param_type, uint32_t param_val);
 
+#ifdef WLAN_FEATURE_DISA
 /**
  * sme_encrypt_decrypt_msg_register_callback() - Registers
  * encrypt/decrypt message callback
@@ -1315,6 +1316,7 @@ QDF_STATUS sme_encrypt_decrypt_msg_deregister_callback(tHalHandle h_hal);
  */
 QDF_STATUS sme_encrypt_decrypt_msg(tHalHandle hal,
 	struct encrypt_decrypt_req_params *encrypt_decrypt_params);
+#endif
 
 /**
  * sme_set_cts2self_for_p2p_go() - sme function to set ini parms to FW.
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 2b9b453c84b5..6ba4d8a89717 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -16653,6 +16653,7 @@ QDF_STATUS sme_set_default_scan_ie(tHalHandle hal, uint16_t session_id,
 	return status;
 }
 
+#ifdef WLAN_FEATURE_DISA
 /**
  * sme_encrypt_decrypt_msg() - handles encrypt/decrypt mesaage
  * @hal: HAL handle
@@ -16783,6 +16784,7 @@ QDF_STATUS sme_encrypt_decrypt_msg_deregister_callback(tHalHandle h_hal)
 	}
 	return status;
 }
+#endif
 
 QDF_STATUS sme_set_cts2self_for_p2p_go(tHalHandle hal_handle)
 {
diff --git a/core/wma/inc/wma_api.h b/core/wma/inc/wma_api.h
index 58d34ec38724..e321cd1af6d2 100644
--- a/core/wma/inc/wma_api.h
+++ b/core/wma/inc/wma_api.h
@@ -299,8 +299,17 @@ void wma_process_pdev_hw_mode_trans_ind(void *wma,
 	wmi_pdev_hw_mode_transition_event_fixed_param *fixed_param,
 	wmi_pdev_set_hw_mode_response_vdev_mac_entry *vdev_mac_entry,
 	struct sir_hw_mode_trans_ind *hw_mode_trans_ind);
+
+#ifdef WLAN_FEATURE_DISA
 QDF_STATUS wma_encrypt_decrypt_msg(WMA_HANDLE wma,
 		struct encrypt_decrypt_req_params *encrypt_decrypt_params);
+#else
+static inline QDF_STATUS wma_encrypt_decrypt_msg(WMA_HANDLE wma,
+		struct encrypt_decrypt_req_params *encrypt_decrypt_params)
+{
+	return 0;
+}
+#endif
 
 /**
  * wma_set_cts2self_for_p2p_go() - set CTS2SELF command for P2P GO.
diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h
index f35044e57d4a..a35254ae321b 100644
--- a/core/wma/inc/wma_internal.h
+++ b/core/wma/inc/wma_internal.h
@@ -1214,7 +1214,15 @@ QDF_STATUS wma_process_hal_pwr_dbg_cmd(WMA_HANDLE handle,
 				       struct sir_mac_pwr_dbg_cmd *
 				       sir_pwr_dbg_params);
 
+#ifdef WLAN_FEATURE_DISA
 int wma_encrypt_decrypt_msg_handler(void *handle, uint8_t *data,
 			uint32_t data_len);
+#else
+static inline int wma_encrypt_decrypt_msg_handler(void *handle, uint8_t *data,
+			uint32_t data_len)
+{
+	return 0;
+}
+#endif
 
 #endif
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index cf0deffae065..52b330d7938e 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -8279,6 +8279,7 @@ QDF_STATUS wma_enable_disable_caevent_ind(tp_wma_handle wma, uint8_t val)
 	return QDF_STATUS_SUCCESS;
 }
 
+#ifdef WLAN_FEATURE_DISA
 /**
  * wma_encrypt_decrypt_msg() -
  * @encrypt_decrypt_params: encryption/decryption params
@@ -8383,3 +8384,4 @@ int wma_encrypt_decrypt_msg_handler(void *handle, uint8_t *data,
 
 	return 0;
 }
+#endif