lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Cleanup WLAN_CONV_CRYPTO_SUPPORTED flag

Browse Source 
WLAN_CONV_CRYPTO_SUPPORTED is a temporary flag which is used for
converged crypto component transition. The transition has already
been done, so cleanup legacy code related to the flag.

Change-Id: I6626a7c9d2ab46cf35ed3593b72c074100954ab8
CRs-fixed: 2593529
This commit is contained in:
Yue Ma 2019-12-26 15:17:38 -08:00 committed by nshrivas
parent 52aa85412f
commit cc2e88a2f9
2 changed files with 1 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/hdd/src/wlan_hdd_assoc.c
View File

@ -5298,9 +5298,7 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
uint8_t *rsn_ie; uint8_t *rsn_ie;
uint16_t rsn_ie_len; uint16_t rsn_ie_len;
uint32_t parse_status; uint32_t parse_status;
#ifdef WLAN_CONV_CRYPTO_SUPPORTED
uint16_t rsn_cap = 0; uint16_t rsn_cap = 0;
#endif
/* /*
* Clear struct of tDot11fIERSN and tDot11fIEWPA specifically * Clear struct of tDot11fIERSN and tDot11fIEWPA specifically
@ -5353,11 +5351,9 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
*mfp_required = (dot11_rsn_ie.RSN_Cap[0] >> 6) & 0x1; *mfp_required = (dot11_rsn_ie.RSN_Cap[0] >> 6) & 0x1;
*mfp_capable = csr_is_mfpc_capable(&dot11_rsn_ie); *mfp_capable = csr_is_mfpc_capable(&dot11_rsn_ie);
#endif #endif
#ifdef WLAN_CONV_CRYPTO_SUPPORTED
qdf_mem_copy(&rsn_cap, dot11_rsn_ie.RSN_Cap, sizeof(rsn_cap)); qdf_mem_copy(&rsn_cap, dot11_rsn_ie.RSN_Cap, sizeof(rsn_cap));
wlan_crypto_set_vdev_param(adapter->vdev, wlan_crypto_set_vdev_param(adapter->vdev,
WLAN_CRYPTO_PARAM_RSN_CAP, rsn_cap); WLAN_CRYPTO_PARAM_RSN_CAP, rsn_cap);
#endif
} else if (gen_ie[0] == DOT11F_EID_WPA) { } else if (gen_ie[0] == DOT11F_EID_WPA) {
/* Validity checks */ /* Validity checks */
if ((gen_ie_len < DOT11F_IE_WPA_MIN_LEN) || if ((gen_ie_len < DOT11F_IE_WPA_MIN_LEN) ||
@ -5503,24 +5499,6 @@ static void hdd_set_mfp_enable(struct csr_roam_profile *roam_profile)
} }
#endif #endif
#ifdef WLAN_CONV_CRYPTO_SUPPORTED
static inline QDF_STATUS
hdd_set_vdev_crypto_prarams_from_ie(struct wlan_objmgr_vdev *vdev,
uint8_t *ie_ptr,
uint16_t ie_len)
{
return wlan_set_vdev_crypto_prarams_from_ie(vdev, ie_ptr, ie_len);
}
#else
static inline QDF_STATUS
hdd_set_vdev_crypto_prarams_from_ie(struct wlan_objmgr_vdev *vdev,
uint8_t *ie_ptr,
uint16_t ie_len)
{
return QDF_STATUS_SUCCESS;
}
#endif
/** /**
* hdd_set_genie_to_csr() - set genie to csr * hdd_set_genie_to_csr() - set genie to csr
* @adapter: pointer to adapter * @adapter: pointer to adapter
@ -5602,7 +5580,7 @@ int hdd_set_genie_to_csr(struct hdd_adapter *adapter,
*rsn_auth_type, rsn_encrypt_type, mc_rsn_encrypt_type); *rsn_auth_type, rsn_encrypt_type, mc_rsn_encrypt_type);
} }
if (QDF_STATUS_SUCCESS != hdd_set_vdev_crypto_prarams_from_ie( if (QDF_STATUS_SUCCESS != wlan_set_vdev_crypto_prarams_from_ie(
adapter->vdev, security_ie, adapter->vdev, security_ie,
(security_ie[1] + 2))) (security_ie[1] + 2)))
hdd_err("Failed to set the crypto params from IE"); hdd_err("Failed to set the crypto params from IE");

35
core/hdd/src/wlan_hdd_cfg80211.c
View File

@ -19136,7 +19136,6 @@ static inline void wlan_hdd_save_hlp_ie(struct csr_roam_profile *roam_profile,
{} {}
#endif #endif
#ifdef WLAN_CONV_CRYPTO_SUPPORTED
/** /**
* hdd_populate_crypto_auth_type() - populate auth type for crypto * hdd_populate_crypto_auth_type() - populate auth type for crypto
* @vdev: pointed to vdev obmgr * @vdev: pointed to vdev obmgr
@ -19285,40 +19284,6 @@ static void hdd_set_crypto_key_mgmt_param(struct hdd_adapter *adapter)
hdd_objmgr_put_vdev(vdev); hdd_objmgr_put_vdev(vdev);
} }
#else
static inline
void hdd_populate_crypto_auth_type(struct wlan_objmgr_vdev *vdev,
enum nl80211_auth_type auth_type)
{
}
static inline
void hdd_populate_crypto_akm_type(struct wlan_objmgr_vdev *vdev,
u32 key_mgmt)
{
}
static inline
void hdd_populate_crypto_cipher_type(u32 cipher,
struct wlan_objmgr_vdev *vdev,
wlan_crypto_param_type
cipher_param_type)
{
}
static inline
void hdd_populate_crypto_params(struct wlan_objmgr_vdev *vdev,
struct cfg80211_connect_params *req)
{
}
static inline void hdd_set_crypto_key_mgmt_param(struct hdd_adapter *adapter)
{
}
#endif
/** /**
* wlan_hdd_cfg80211_set_ie() - set IEs * wlan_hdd_cfg80211_set_ie() - set IEs
* @adapter: Pointer to adapter * @adapter: Pointer to adapter