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
This commit is contained in:
psimha 2018-04-02 12:33:30 -07:00 • committed by nshrivas
commit 1dc65bdf61

View file

@ -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: