samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Cleanup CRYPTO_SET_KEY_CONVERGED for MAC layer

Browse Source 
CRYPTO_SET_KEY_CONVERGED 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 in MAC layer.

Change-Id: I34fb7a6a67dd6dba3fa69c98ef10a1bd51383e36
CRs-fixed: 2593525
This commit is contained in:
Yue Ma
2019-12-23 12:38:08 -08:00
committed by nshrivas
parent 85205b41d2
commit e5a28495ab
6 changed files with 8 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
components/mlme/dispatcher/src/wlan_mlme_api.c
View File

@@ -2468,7 +2468,6 @@ QDF_STATUS wlan_mlme_get_edca_params(struct wlan_mlme_edca_params *edca_params,
return QDF_STATUS_SUCCESS;
}
#ifdef CRYPTO_SET_KEY_CONVERGED
QDF_STATUS mlme_get_wep_key(struct wlan_objmgr_vdev *vdev,
struct wlan_mlme_wep_cfg *wep_params,
enum wep_key_id wep_keyid, uint8_t *default_key,
@@ -2495,45 +2494,6 @@ QDF_STATUS mlme_get_wep_key(struct wlan_objmgr_vdev *vdev,
return QDF_STATUS_SUCCESS;
}
#else
QDF_STATUS mlme_get_wep_key(struct wlan_objmgr_vdev *vdev,
struct wlan_mlme_wep_cfg *wep_params,
enum wep_key_id wep_keyid, uint8_t *default_key,
qdf_size_t *key_len)
{
switch (wep_keyid) {
case MLME_WEP_DEFAULT_KEY_1:
wlan_mlme_get_cfg_str(default_key,
&wep_params->wep_default_key_1,
key_len);
break;
case MLME_WEP_DEFAULT_KEY_2:
wlan_mlme_get_cfg_str(default_key,
&wep_params->wep_default_key_2,
key_len);
break;
case MLME_WEP_DEFAULT_KEY_3:
wlan_mlme_get_cfg_str(default_key,
&wep_params->wep_default_key_3,
key_len);
break;
case MLME_WEP_DEFAULT_KEY_4:
wlan_mlme_get_cfg_str(default_key,
&wep_params->wep_default_key_4,
key_len);
break;
default:
mlme_legacy_err("Invalid key id:%d", wep_keyid);
return QDF_STATUS_E_INVAL;
}
mlme_legacy_debug("key_id:%d key_len:%zd", wep_keyid, *key_len);
return QDF_STATUS_SUCCESS;
}
#endif /* CRYPTO_SET_KEY_CONVERGED */
QDF_STATUS mlme_set_wep_key(struct wlan_mlme_wep_cfg *wep_params,
enum wep_key_id wep_keyid, uint8_t *key_to_set,