qcacld-3.0: Save hlp info in mlme priv

Host moves hlp info from csr session to mlme priv object. Modules need
hlp info now use hlp info from mlme priv object

Change-Id: Ieffa749635239f72337af685707acccfd666a58a
CRs-Fixed: 2862315
This commit is contained in:
Abhishek Ambure
2021-01-27 20:51:03 +05:30
committed by snandini
parent 4afda23e63
commit 467050ebbd
24 changed files with 347 additions and 179 deletions

View File

@@ -262,6 +262,9 @@ struct ft_context {
* @qos_enabled: is qos enabled
* @is_wps is wps connection
* @ft_info: ft related info
* @hlp_ie: hldp ie
* @hlp_ie_len: hlp ie length
* @fils_con_info: Pointer to fils connection info from connect req
*/
struct mlme_connect_info {
uint8_t timing_meas_cap;
@@ -274,6 +277,11 @@ struct mlme_connect_info {
bool qos_enabled;
bool is_wps;
struct ft_context ft_info;
#ifdef WLAN_FEATURE_FILS_SK
uint8_t *hlp_ie;
uint32_t hlp_ie_len;
struct wlan_fils_connection_info *fils_con_info;
#endif
};
/**
@@ -299,7 +307,6 @@ struct mlme_connect_info {
* @sae_auth_retry: SAE auth retry information
* @roam_reason_better_ap: roam due to better AP found
* @hb_failure_rssi: heartbeat failure AP RSSI
* @fils_con_info: Pointer to fils connection info from csr roam profile
* @opr_rate_set: operational rates set
* @ext_opr_rate_set: extended operational rates set
* @mscs_req_info: Information related to mscs request
@@ -329,9 +336,6 @@ struct mlme_legacy_priv {
struct sae_auth_retry sae_retry;
bool roam_reason_better_ap;
uint32_t hb_failure_rssi;
#ifdef WLAN_FEATURE_FILS_SK
struct wlan_fils_connection_info *fils_con_info;
#endif
struct mlme_cfg_str opr_rate_set;
struct mlme_cfg_str ext_opr_rate_set;
#ifdef WLAN_FEATURE_MSCS

View File

@@ -1160,6 +1160,20 @@ static QDF_STATUS mlme_get_vdev_types(enum QDF_OPMODE mode, uint8_t *type,
return status;
}
#ifdef WLAN_FEATURE_FILS_SK
static inline void mlme_free_fils_info(struct mlme_connect_info *connect_info)
{
qdf_mem_free(connect_info->fils_con_info);
qdf_mem_free(connect_info->hlp_ie);
connect_info->hlp_ie = NULL;
connect_info->hlp_ie_len = 0;
connect_info->fils_con_info = NULL;
}
#else
static inline void mlme_free_fils_info(struct mlme_connect_info *connect_info)
{}
#endif
static void mlme_ext_handler_destroy(struct vdev_mlme_obj *vdev_mlme)
{
if (!vdev_mlme || !vdev_mlme->ext_vdev_ptr)
@@ -1172,8 +1186,7 @@ static void mlme_ext_handler_destroy(struct vdev_mlme_obj *vdev_mlme)
wlan_cm_rso_config_deinit(vdev_mlme->vdev,
&vdev_mlme->ext_vdev_ptr->rso_cfg);
#endif
qdf_mem_free(vdev_mlme->ext_vdev_ptr->fils_con_info);
vdev_mlme->ext_vdev_ptr->fils_con_info = NULL;
mlme_free_fils_info(&vdev_mlme->ext_vdev_ptr->connect_info);
qdf_mem_free(vdev_mlme->ext_vdev_ptr);
vdev_mlme->ext_vdev_ptr = NULL;
}
@@ -1196,7 +1209,7 @@ QDF_STATUS vdevmgr_mlme_ext_hdl_create(struct vdev_mlme_obj *vdev_mlme)
return QDF_STATUS_E_NOMEM;
mlme_init_rate_config(vdev_mlme);
vdev_mlme->ext_vdev_ptr->fils_con_info = NULL;
vdev_mlme->ext_vdev_ptr->connect_info.fils_con_info = NULL;
/* This is temp ifdef will be removed in near future */
#ifndef FEATURE_CM_ENABLE
wlan_cm_rso_config_init(vdev_mlme->vdev,