From 1dc65bdf61aa7a77e1dcbbfe4ff41a8cc0c10c67 Mon Sep 17 00:00:00 2001 From: psimha Date: Mon, 2 Apr 2018 12:33:30 -0700 Subject: [PATCH] qcacld-3.0: Change security type data structure in API call Change htt_sec_type to cdp_sec_type since the CDP API expects a cdp_sec_type as it's argument. Required for compilation using LLVM. Change-Id: I8dbf59dd80bd0fce221a23544c69764508377ae0 CRs-Fixed: 2216859 --- core/wma/src/wma_mgmt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 93df8bba220e..2c62807bdacd 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -1633,7 +1633,7 @@ static QDF_STATUS wma_setup_install_key_cmd(tp_wma_handle wma_handle, struct set_key_params params; QDF_STATUS status = QDF_STATUS_SUCCESS; struct wma_txrx_node *iface = NULL; - enum htt_sec_type sec_type = htt_sec_type_none; + enum cdp_sec_type sec_type = cdp_sec_type_none; void *soc = cds_get_context(QDF_MODULE_ID_SOC); struct cdp_pdev *txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX); struct cdp_vdev *txrx_vdev; @@ -1690,7 +1690,7 @@ static QDF_STATUS wma_setup_install_key_cmd(tp_wma_handle wma_handle, switch (key_params->key_type) { case eSIR_ED_NONE: params.key_cipher = WMI_CIPHER_NONE; - sec_type = htt_sec_type_none; + sec_type = cdp_sec_type_none; break; case eSIR_ED_WEP40: case eSIR_ED_WEP104: @@ -1704,13 +1704,13 @@ static QDF_STATUS wma_setup_install_key_cmd(tp_wma_handle wma_handle, WMA_LOGD("AP Mode: cmd->key_flags |= TX_USAGE"); params.key_flags |= TX_USAGE; } - sec_type = htt_sec_type_wep104; + sec_type = cdp_sec_type_wep104; break; case eSIR_ED_TKIP: params.key_txmic_len = WMA_TXMIC_LEN; params.key_rxmic_len = WMA_RXMIC_LEN; params.key_cipher = WMI_CIPHER_TKIP; - sec_type = htt_sec_type_tkip; + sec_type = cdp_sec_type_tkip; break; #ifdef FEATURE_WLAN_WAPI #define WPI_IV_LEN 16 @@ -1750,7 +1750,7 @@ static QDF_STATUS wma_setup_install_key_cmd(tp_wma_handle wma_handle, #endif /* FEATURE_WLAN_WAPI */ case eSIR_ED_CCMP: params.key_cipher = WMI_CIPHER_AES_CCM; - sec_type = htt_sec_type_aes_ccmp; + sec_type = cdp_sec_type_aes_ccmp; break; #ifdef WLAN_FEATURE_11W case eSIR_ED_AES_128_CMAC: