qcacmn: Modify DISA legacy code to point to the DISA CLD component
DISA feature has been moved to a CLD component under the converged
driver model. Point the wmi API's and structures to the newly defined
files. Define new API's to extract parameters from event buffer.
Change-Id: Ia47d3682217e7ce9c021bb2db8319483c881b3b2
CRs-Fixed: 2161963
diff --git a/wmi_unified_api.h b/wmi_unified_api.h
index e3711df..6c33ac6 100644
--- a/wmi_unified_api.h
+++ b/wmi_unified_api.h
@@ -604,8 +604,30 @@
QDF_STATUS wmi_unified_setup_install_key_cmd(void *wmi_hdl,
struct set_key_params *key_params);
+#ifdef WLAN_FEATURE_DISA
+/**
+ * wmi_unified_encrypt_decrypt_send_cmd() - send encryptdecrypt cmd to fw
+ * @wmi_hdl: wmi handle
+ * @params: encrypt/decrypt params
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
QDF_STATUS wmi_unified_encrypt_decrypt_send_cmd(void *wmi_hdl,
- struct encrypt_decrypt_req_params *params);
+ struct disa_encrypt_decrypt_req_params *params);
+
+/**
+ * wmi_extract_encrypt_decrypt_resp_params() -
+ * extract encrypt decrypt resp params from event buffer
+ * @wmi_handle: wmi handle
+ * @evt_buf: pointer to event buffer
+ * @resp: encrypt decrypt resp params
+ *
+ * Return: QDF_STATUS_SUCCESS for success or error code
+ */
+QDF_STATUS wmi_extract_encrypt_decrypt_resp_params(void *wmi_hdl,
+ uint8_t *evt_buf,
+ struct disa_encrypt_decrypt_resp_params *resp);
+#endif
QDF_STATUS wmi_unified_p2p_go_set_beacon_ie_cmd(void *wmi_hdl,
A_UINT32 vdev_id, uint8_t *p2p_ie);
diff --git a/wmi_unified_param.h b/wmi_unified_param.h
index ad48a91..e33570d 100644
--- a/wmi_unified_param.h
+++ b/wmi_unified_param.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -7714,38 +7714,6 @@
};
/**
- * struct encrypt_decrypt_req_params - encrypt/decrypt params
- * @vdev_id: virtual device id
- * @key_flag: This indicates firmware to encrypt/decrypt payload
- * see ENCRYPT_DECRYPT_FLAG
- * @key_idx: Index used in storing key
- * @key_cipher: cipher used for encryption/decryption
- * Eg: see WMI_CIPHER_AES_CCM for CCMP
- * @key_len: length of key data
- * @key_txmic_len: length of Tx MIC
- * @key_rxmic_len: length of Rx MIC
- * @key_data: Key
- * @pn: packet number
- * @mac_header: MAC header
- * @data_len: length of data
- * @data: pointer to payload
- */
-struct encrypt_decrypt_req_params {
- uint32_t vdev_id;
- uint8_t key_flag;
- uint32_t key_idx;
- uint32_t key_cipher;
- uint32_t key_len;
- uint32_t key_txmic_len;
- uint32_t key_rxmic_len;
- uint8_t key_data[MAC_MAX_KEY_LENGTH];
- uint8_t pn[MAC_PN_LENGTH];
- uint8_t mac_header[MAX_MAC_HEADER_LEN];
- uint32_t data_len;
- uint8_t *data;
-};
-
-/**
* HW mode config type replicated from FW header
* @WMI_HOST_HW_MODE_SINGLE: Only one PHY is active.
* @WMI_HOST_HW_MODE_DBS: Both PHYs are active in different bands,
diff --git a/wmi_unified_priv.h b/wmi_unified_priv.h
index dea8f59..6a0081d 100644
--- a/wmi_unified_priv.h
+++ b/wmi_unified_priv.h
@@ -1333,7 +1333,11 @@
#ifdef WLAN_FEATURE_DISA
QDF_STATUS (*send_encrypt_decrypt_send_cmd)(wmi_unified_t wmi_handle,
- struct encrypt_decrypt_req_params *params);
+ struct disa_encrypt_decrypt_req_params *params);
+
+QDF_STATUS (*extract_encrypt_decrypt_resp_event)(wmi_unified_t wmi_handle,
+ void *evt_buf,
+ struct disa_encrypt_decrypt_resp_params *resp);
#endif
QDF_STATUS (*send_sar_limit_cmd)(wmi_unified_t wmi_handle,