瀏覽代碼

qcacld-3.0: Retain WTC mode value after vdev delete

After mac randomization, the change interface causes
the WTC mode to be reset as part of the hdd_init_station_mode()

Initialize the WTC mode during start modules as part
of the mlme component cfg values population.

Change-Id: I4a57c29053f0100c14cef067952d49cecbdc8ea5
CRs-Fixed: 3047594
Pragaspathi Thilagaraj 3 年之前
父節點
當前提交
330a20ccff

+ 1 - 0
components/mlme/core/src/wlan_mlme_main.c

@@ -1589,6 +1589,7 @@ static void mlme_init_roam_offload_cfg(struct wlan_objmgr_psoc *psoc,
 	lfr->idle_roam_min_rssi = cfg_get(psoc, CFG_LFR_IDLE_ROAM_MIN_RSSI);
 	lfr->roam_trigger_bitmap =
 		cfg_get(psoc, CFG_ROAM_TRIGGER_BITMAP);
+	lfr->vendor_btm_param.user_roam_reason = DISABLE_VENDOR_BTM_CONFIG;
 
 	lfr->idle_roam_band = cfg_get(psoc, CFG_LFR_IDLE_ROAM_BAND);
 	lfr->sta_roam_disable = cfg_get(psoc, CFG_STA_DISABLE_ROAM);

+ 0 - 17
components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_api.h

@@ -28,9 +28,6 @@
 #include "wlan_mlme_main.h"
 #include "wlan_mlme_api.h"
 
-/* Default value of reason code */
-#define DISABLE_VENDOR_BTM_CONFIG 2
-
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
 /**
  * wlan_cm_enable_roaming_on_connected_sta() - Enable roaming on other connected
@@ -848,15 +845,6 @@ void
 wlan_cm_roam_set_vendor_btm_params(struct wlan_objmgr_psoc *psoc,
 				   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
- *
- * Return: none
- */
-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
@@ -1151,11 +1139,6 @@ wlan_cm_roam_set_vendor_btm_params(struct wlan_objmgr_psoc *psoc,
 				   struct wlan_cm_roam_vendor_btm_params *param)
 {}
 
-static inline void
-wlan_cm_roam_get_vendor_btm_params(struct wlan_objmgr_psoc *psoc,
-				   struct wlan_cm_roam_vendor_btm_params *param)
-{}
-
 static inline void
 wlan_cm_roam_get_score_delta_params(struct wlan_objmgr_psoc *psoc,
 				    uint8_t vdev_id,

+ 3 - 0
components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h

@@ -109,6 +109,9 @@
 #define MAX_BSSID_FAVORED      16
 #define WLAN_MAX_BTM_CANDIDATES      8
 
+/* Default value of WTC reason code */
+#define DISABLE_VENDOR_BTM_CONFIG 2
+
 #ifdef WLAN_FEATURE_HOST_ROAM
 #define MAX_FTIE_SIZE CM_MAX_FTIE_SIZE
 #else

+ 0 - 14
components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c

@@ -586,20 +586,6 @@ wlan_cm_dual_sta_roam_update_connect_channels(struct wlan_objmgr_psoc *psoc,
 	qdf_mem_free(chan_buff);
 }
 
-void
-wlan_cm_roam_disable_vendor_btm(struct wlan_objmgr_psoc *psoc)
-{
-	struct wlan_mlme_psoc_ext_obj *mlme_obj;
-
-	mlme_obj = mlme_get_psoc_ext_obj(psoc);
-	if (!mlme_obj)
-		return;
-
-	/* Set default value of reason code */
-	mlme_obj->cfg.lfr.vendor_btm_param.user_roam_reason =
-					DISABLE_VENDOR_BTM_CONFIG;
-}
-
 void
 wlan_cm_roam_set_vendor_btm_params(struct wlan_objmgr_psoc *psoc,
 				   struct wlan_cm_roam_vendor_btm_params *param)

+ 0 - 1
core/hdd/src/wlan_hdd_main.c

@@ -6144,7 +6144,6 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 		roam_triggers = ucfg_mlme_get_roaming_triggers(hdd_ctx->psoc);
 		mlme_set_roam_trigger_bitmap(hdd_ctx->psoc, adapter->vdev_id,
 					     roam_triggers);
-		wlan_cm_roam_disable_vendor_btm(hdd_ctx->psoc);
 		ucfg_mlme_get_fine_time_meas_cap(hdd_ctx->psoc,
 						 &fine_time_meas_cap);
 		sme_cli_set_command(