Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 094c6bd3 authored by Pragaspathi Thilagaraj's avatar Pragaspathi Thilagaraj Committed by Madan Koyyalamudi
Browse files

qcacld-3.0: Add support to retain WTC params across disconnection 

The WTC parameters are stored in MLME vdev private object.
So the parameters are cleared once vdev delete is done.

Move the WTC parameters to psoc->mlme_cfg to retain the
values across disconnections.

Change-Id: Icecfbef19af994f8a05622501d435bfb63beca50
CRs-Fixed: 2959715
parent cab99f6e

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

+2 −0
Original line number Diff line number Diff line
@@ -1583,6 +1583,7 @@ struct fw_scan_channels { 
/*

 * @mawc_roam_enabled:              Enable/Disable MAWC during roaming

 * @enable_fast_roam_in_concurrency:Enable LFR roaming on STA during concurrency

 * @vendor_btm_param:               Vendor WTC roam trigger parameters

 * @lfr3_roaming_offload:           Enable/disable roam offload feature

 * @lfr3_dual_sta_roaming_enabled:  Enable/Disable dual sta roaming offload

 * feature
@@ -1700,6 +1701,7 @@ struct wlan_mlme_lfr_cfg { 
	bool mawc_roam_enabled;

	bool enable_fast_roam_in_concurrency;

#ifdef WLAN_FEATURE_ROAM_OFFLOAD

	struct wlan_cm_roam_vendor_btm_params vendor_btm_param;

	bool lfr3_roaming_offload;

	bool lfr3_dual_sta_roaming_enabled;

	bool enable_self_bss_roam;

components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.c

+1 −2
Original line number Diff line number Diff line
@@ -118,8 +118,7 @@ cm_roam_triggers(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id, 
		mlme_get_roam_trigger_bitmap(psoc, vdev_id);

	params->roam_scan_scheme_bitmap =

		wlan_cm_get_roam_scan_scheme_bitmap(psoc, vdev_id);

	wlan_cm_roam_get_vendor_btm_params(psoc, vdev_id,

					   &params->vendor_btm_param);

	wlan_cm_roam_get_vendor_btm_params(psoc, &params->vendor_btm_param);

	wlan_cm_roam_get_score_delta_params(psoc, params);

	wlan_cm_roam_get_min_rssi_params(psoc, params);

}

components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_api.h

+5 −14
Original line number Diff line number Diff line
@@ -499,40 +499,33 @@ wlan_cm_dual_sta_roam_update_connect_channels(struct wlan_objmgr_psoc *psoc, 
/**

 * wlan_cm_roam_set_vendor_btm_params() - API to set vendor btm params

 * @psoc: PSOC pointer

 * @vdev_id: VDEV id

 * @param: vendor configured roam trigger param

 *

 * Return: none

 */

void

wlan_cm_roam_set_vendor_btm_params(struct wlan_objmgr_psoc *psoc,

				   uint8_t vdev_id,

				   struct wlan_cm_roam_vendor_btm_params

								*param);

/**

 * wlan_cm_roam_disable_vendor_btm() - API to disable vendor btm by default

 * reason

 * @psoc: PSOC pointer

 * @vdev_id: VDEV id

 *

 * Return: none

 */

void

wlan_cm_roam_disable_vendor_btm(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id);

void wlan_cm_roam_disable_vendor_btm(struct wlan_objmgr_psoc *psoc);



/**

 * wlan_cm_roam_get_vendor_btm_params() - API to get vendor btm param

 * @psoc: PSOC pointer

 * @vdev_id: VDEV id

 * @param: vendor configured roam trigger param

 *

 * Return: none

 */

void

wlan_cm_roam_get_vendor_btm_params(struct wlan_objmgr_psoc *psoc,

				   uint8_t vdev_id,

				   struct wlan_cm_roam_vendor_btm_params

								*param);

void wlan_cm_roam_get_vendor_btm_params(

		struct wlan_objmgr_psoc *psoc,

		struct wlan_cm_roam_vendor_btm_params *param);



/**

 * wlan_cm_roam_get_score_delta_params() - API to get roam score delta param
@@ -656,18 +649,16 @@ wlan_cm_roam_extract_roam_msg_info(wmi_unified_t wmi, void *evt_buf, 
}



static inline void

wlan_cm_roam_disable_vendor_btm(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id)

wlan_cm_roam_disable_vendor_btm(struct wlan_objmgr_psoc *psoc)

{}



static inline void

wlan_cm_roam_set_vendor_btm_params(struct wlan_objmgr_psoc *psoc,

				   uint8_t vdev_id,

				   struct wlan_cm_roam_vendor_btm_params *param)

{}



static inline void

wlan_cm_roam_get_vendor_btm_params(struct wlan_objmgr_psoc *psoc,

				   uint8_t vdev_id,

				   struct wlan_cm_roam_vendor_btm_params *param)

{}

components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h

+0 −2
Original line number Diff line number Diff line
@@ -1400,13 +1400,11 @@ struct wlan_cm_rso_configs { 
 * data related structure

 * @pcl_vdev_cmd_active:  Flag to check if vdev level pcl command needs to be

 * sent or PDEV level PCL command needs to be sent

 * @control_param: vendor configured roam control param

 * @vdev_rso_config: Roam scan offload related configurations. Equivalent to the

 * legacy tpCsrNeighborRoamControlInfo structure.

 */

struct wlan_cm_roam {

	bool pcl_vdev_cmd_active;

	struct wlan_cm_roam_vendor_btm_params vendor_btm_param;

	struct wlan_cm_rso_configs vdev_rso_config;

};

components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c

+15 −55
Original line number Diff line number Diff line
@@ -391,85 +391,45 @@ wlan_cm_dual_sta_roam_update_connect_channels(struct wlan_objmgr_psoc *psoc, 
}



void

wlan_cm_roam_disable_vendor_btm(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id)

wlan_cm_roam_disable_vendor_btm(struct wlan_objmgr_psoc *psoc)

{

	struct wlan_objmgr_vdev *vdev;

	struct mlme_legacy_priv *mlme_priv;



	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id,

						    WLAN_MLME_NB_ID);

	if (!vdev) {

		mlme_err("vdev object is NULL");

		return;

	}

	struct wlan_mlme_psoc_ext_obj *mlme_obj;



	mlme_priv = wlan_vdev_mlme_get_ext_hdl(vdev);

	if (!mlme_priv) {

		mlme_err("vdev legacy private object is NULL");

		wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_NB_ID);

	mlme_obj = mlme_get_psoc_ext_obj(psoc);

	if (!mlme_obj)

		return;

	}



	/* Set default value of reason code */

	mlme_priv->cm_roam.vendor_btm_param.user_roam_reason =

	mlme_obj->cfg.lfr.vendor_btm_param.user_roam_reason =

					DISABLE_VENDOR_BTM_CONFIG;

	wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_NB_ID);

}



void

wlan_cm_roam_set_vendor_btm_params(struct wlan_objmgr_psoc *psoc,

				   uint8_t vdev_id,

				   struct wlan_cm_roam_vendor_btm_params

									*param)

				   struct wlan_cm_roam_vendor_btm_params *param)

{

	struct wlan_objmgr_vdev *vdev;

	struct mlme_legacy_priv *mlme_priv;



	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id,

						    WLAN_MLME_NB_ID);

	if (!vdev) {

		mlme_err("vdev object is NULL");

		return;

	}

	struct wlan_mlme_psoc_ext_obj *mlme_obj;



	mlme_priv = wlan_vdev_mlme_get_ext_hdl(vdev);

	if (!mlme_priv) {

		mlme_err("vdev legacy private object is NULL");

		wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_NB_ID);

	mlme_obj = mlme_get_psoc_ext_obj(psoc);

	if (!mlme_obj)

		return;

	}



	qdf_mem_copy(&mlme_priv->cm_roam.vendor_btm_param, param,

	qdf_mem_copy(&mlme_obj->cfg.lfr.vendor_btm_param, param,

		     sizeof(struct wlan_cm_roam_vendor_btm_params));

	wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_NB_ID);

}



void

wlan_cm_roam_get_vendor_btm_params(struct wlan_objmgr_psoc *psoc,

				   uint8_t vdev_id,

				   struct wlan_cm_roam_vendor_btm_params *param)

{

	struct wlan_objmgr_vdev *vdev;

	struct mlme_legacy_priv *mlme_priv;



	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id,

						    WLAN_MLME_NB_ID);

	if (!vdev) {

		mlme_err("vdev object is NULL");

		return;

	}

	struct wlan_mlme_psoc_ext_obj *mlme_obj;



	mlme_priv = wlan_vdev_mlme_get_ext_hdl(vdev);

	if (!mlme_priv) {

		mlme_err("vdev legacy private object is NULL");

		wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_NB_ID);

	mlme_obj = mlme_get_psoc_ext_obj(psoc);

	if (!mlme_obj)

		return;

	}



	qdf_mem_copy(param, &mlme_priv->cm_roam.vendor_btm_param,

	qdf_mem_copy(param, &mlme_obj->cfg.lfr.vendor_btm_param,

		     sizeof(struct wlan_cm_roam_vendor_btm_params));



	wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_NB_ID);

}



void