qcacld-3.0: Fill extra params for connect

Fill extra params such as join timeout etc. in LIM
for connection manager path.

Change-Id: I3c12e49023ce04c6b8d2f6c41d128ed9fc93a441
CRs-Fixed: 2879094

components/mlme/core/src/wlan_mlme_main.c

@@ -653,6 +653,7 @@ static void mlme_init_timeout_cfg(struct wlan_objmgr_psoc *psoc,
 {
 	timeouts->join_failure_timeout =
 			cfg_get(psoc, CFG_JOIN_FAILURE_TIMEOUT);
+	timeouts->join_failure_timeout_ori = timeouts->join_failure_timeout;
 	timeouts->auth_failure_timeout =
 			cfg_get(psoc, CFG_AUTH_FAILURE_TIMEOUT);
 	timeouts->auth_rsp_timeout =

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -2176,7 +2176,8 @@ struct wlan_mlme_power {
 
 /*
  * struct wlan_mlme_timeout - mlme timeout related config items
- * @join_failure_timeout: join failure timeout
+ * @join_failure_timeout: join failure timeout (can be changed in connect req)
+ * @join_failure_timeout_ori: original value of above join timeout
  * @auth_failure_timeout: authenticate failure timeout
  * @auth_rsp_timeout: authenticate response timeout
  * @assoc_failure_timeout: assoc failure timeout
@@ -2192,6 +2193,7 @@ struct wlan_mlme_power {
  */
 struct wlan_mlme_timeout {
 	uint32_t join_failure_timeout;
+	uint32_t join_failure_timeout_ori;
 	uint32_t auth_failure_timeout;
 	uint32_t auth_rsp_timeout;
 	uint32_t assoc_failure_timeout;

core/hdd/src/wlan_hdd_regulatory.c

@@ -1000,7 +1000,6 @@ void hdd_reg_notifier(struct wiphy *wiphy,
 				reset = true;
 		} else if (NL80211_REGDOM_SET_BY_DRIVER == request->initiator) {
 			hdd_ctx->reg.cc_src = SOURCE_DRIVER;
-			sme_set_cc_src(hdd_ctx->mac_handle, SOURCE_DRIVER);
 		} else {
 			hdd_ctx->reg.cc_src = SOURCE_USERSPACE;
 			hdd_restore_custom_reg_settings(wiphy,
@@ -1646,7 +1645,6 @@ static void hdd_regulatory_dyn_cbk(struct wlan_objmgr_psoc *psoc,
 	fill_wiphy_6ghz_band_channels(wiphy, chan_list);
 	cc_src = ucfg_reg_get_cc_and_src(hdd_ctx->psoc, alpha2);
 	qdf_mem_copy(hdd_ctx->reg.alpha2, alpha2, REG_ALPHA2_LEN + 1);
-	sme_set_cc_src(hdd_ctx->mac_handle, cc_src);
 
 	/* Check the kernel version for upstream commit aced43ce780dc5 that
 	 * has support for processing user cell_base hints when wiphy is
@@ -1714,7 +1712,6 @@ int hdd_regulatory_init(struct hdd_context *hdd_ctx, struct wiphy *wiphy)
 		fill_wiphy_6ghz_band_channels(wiphy, cur_chan_list);
 		cc_src = ucfg_reg_get_cc_and_src(hdd_ctx->psoc, alpha2);
 		qdf_mem_copy(hdd_ctx->reg.alpha2, alpha2, REG_ALPHA2_LEN + 1);
-		sme_set_cc_src(hdd_ctx->mac_handle, cc_src);
 	} else {
 		hdd_ctx->reg_offload = false;
 	}

core/mac/inc/ani_global.h

@@ -776,7 +776,6 @@ struct mac_context {
 	void (*chan_info_cb)(struct scan_chan_info *chan_info);
 	void (*del_peers_ind_cb)(struct wlan_objmgr_psoc *psoc,
 				 uint8_t vdev_id);
-	enum  country_src reg_hint_src;
 	uint32_t rx_packet_drop_counter;
 	enum tx_ack_status auth_ack_status;
 	enum tx_ack_status assoc_ack_status;

core/mac/inc/sir_api.h

@@ -167,6 +167,52 @@ enum sir_roam_op_code {
 	SIR_ROAMING_DEAUTH,
 };
 
+/**
+ * enum ps_state - State of the power save
+ * @FULL_POWER_MODE: for Full power mode
+ * @LEGACY_POWER_SAVE_MODE: For Legacy Power Save mode
+ * @UAPSD_MODE: for UAPSD power save
+ */
+enum ps_state {
+	FULL_POWER_MODE,
+	LEGACY_POWER_SAVE_MODE,
+	UAPSD_MODE
+};
+
+/**
+ * struct ps_params - maintain power save state and USAPD params
+ * @mac_ctx: mac_ctx
+ * @session_id: Session Id.
+ * @ps_state : State of the power save
+ * @uapsd_per_ac_trigger_enable_mask: dynamic UPASD mask setting
+ *		derived from AddTS Rsp and DelTS frame.
+ *		If a particular AC bit is set, it means AC is trigger  enabled.
+ * @uapsd_per_ac_delivery_enable_mask: dynamic UPASD mask setting
+ *		derived from AddTS Rsp and DelTs frame.
+ *		If a particular AC bit is set, it means AC is delivery enabled.
+ * @ac_admit_mask: used for AC downgrade. This is a dynamic mask
+ *		setting which keep tracks of ACs being admitted.
+ *		If bit is set to 0: That particular AC is not admitted
+ *		If bit is set to 1: That particular AC is admitted
+ * @uapsd_per_ac_bit_mask: This is a static UAPSD mask setting
+ *		derived from SME_JOIN_REQ and SME_REASSOC_REQ.
+ *		If a particular AC bit is set, it means the AC is both
+ *		trigger enabled and delivery enabled.
+ * @auto_ps_enable_timer: Upon expiration of this timer	Power Save Offload
+ *		module will try to enable sta mode ps
+ */
+
+struct ps_params {
+	void *mac_ctx;
+	uint32_t     session_id;
+	enum    ps_state ps_state;
+	uint8_t uapsd_per_ac_trigger_enable_mask;
+	uint8_t uapsd_per_ac_delivery_enable_mask;
+	uint8_t ac_admit_mask[SIR_MAC_DIRECTION_DIRECT];
+	uint8_t uapsd_per_ac_bit_mask;
+	qdf_mc_timer_t auto_ps_enable_timer;
+};
+
 /* Type declarations used by Firmware and Host software */
 
 /* Scan type enum used in scan request */

core/mac/src/include/parser_api.h

@@ -1271,6 +1271,9 @@ wlan_get_parsed_bss_description_ies(struct mac_context *mac_ctx,
 				    struct bss_description *bss_desc,
 				    tDot11fBeaconIEs **ie_struct);
 
+uint32_t wlan_get_11h_power_constraint(struct mac_context *mac_ctx,
+				       tDot11fIEPowerConstraints *constraints);
+
 QDF_STATUS
 wlan_fill_bss_desc_from_scan_entry(struct mac_context *mac_ctx,
 				   struct bss_description *bss_desc,

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -2525,6 +2525,10 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 	struct cm_roam_values_copy config;
 	bool ese_ver_present;
 	int8_t reg_max;
+	struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
+	struct ps_params *ps_param =
+				&ps_global_info->ps_params[session->vdev_id];
+	uint32_t join_timeout;
 
 	/*
 	 * Update the capability here itself as this is used in
@@ -2558,6 +2562,10 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 		return QDF_STATUS_E_FAILURE;
 	}
 
+	mac_ctx->mlme_cfg->power.local_power_constraint =
+		wlan_get_11h_power_constraint(mac_ctx,
+					      &ie_struct->PowerConstraints);
+
 	session->enable_session_twt_support =
 					lim_enable_twt(mac_ctx, ie_struct);
 
@@ -2574,12 +2582,31 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 		return QDF_STATUS_E_FAILURE;
 	}
 
+	if (session->dot11mode == MLME_DOT11_MODE_11B)
+		mac_ctx->mlme_cfg->feature_flags.enable_short_slot_time_11g = 0;
+	else
+		mac_ctx->mlme_cfg->feature_flags.enable_short_slot_time_11g =
+			mac_ctx->mlme_cfg->ht_caps.short_slot_time_enabled;
+
 	status = lim_check_and_validate_6g_ap(mac_ctx, bss_desc, ie_struct);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		qdf_mem_free(ie_struct);
 		return QDF_STATUS_E_FAILURE;
 	}
 
+	/*
+	 * Join timeout: if we find a BeaconInterval in the BssDescription,
+	 * then set the Join Timeout to be 10 x the BeaconInterval.
+	 */
+	join_timeout = mac_ctx->mlme_cfg->timeouts.join_failure_timeout_ori;
+	if (bss_desc->beaconInterval)
+		join_timeout = QDF_MAX(10 * bss_desc->beaconInterval,
+				       join_timeout);
+
+	mac_ctx->mlme_cfg->timeouts.join_failure_timeout =
+		QDF_MIN(join_timeout,
+			mac_ctx->mlme_cfg->timeouts.join_failure_timeout_ori);
+
 	lim_join_req_update_ht_vht_caps(mac_ctx, session, bss_desc,
 					ie_struct);
 
@@ -2822,6 +2849,7 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 			}
 			session->gUapsdPerAcBitmask = value;
 		}
+		ps_param->uapsd_per_ac_bit_mask = session->gUapsdPerAcBitmask;
 	}
 
 	if (session->gLimCurrentBssUapsd) {

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -6604,6 +6604,21 @@ wlan_get_parsed_bss_description_ies(struct mac_context *mac_ctx,
 	return status;
 }
 
+uint32_t wlan_get_11h_power_constraint(struct mac_context *mac_ctx,
+				       tDot11fIEPowerConstraints *constraints)
+{
+	uint32_t local_power_constraint = 0;
+
+	/*
+	 * check if .11h support is enabled, if not,
+	 * the power constraint is 0.
+	 */
+	if (mac_ctx->mlme_cfg->gen.enabled_11h && constraints->present)
+		local_power_constraint = constraints->localPowerConstraints;
+
+	return local_power_constraint;
+}
+
 #ifdef FEATURE_WLAN_ESE
 static void wlan_fill_qbss_load_param(tDot11fBeaconIEs *bcn_ies,
 				      struct bss_description *bss_desc)

core/sme/inc/csr_internal.h

@@ -191,16 +191,8 @@ struct bss_config_param {
 	eCsrMediaAccessType qosType;
 	tSirMacSSid SSID;
 	enum csr_cfgdot11mode uCfgDot11Mode;
-	enum reg_wifi_band band;
 	tAniAuthType authType;
-	eCsrEncryptionType encType;
-	uint32_t uShortSlotTime;
-	uint32_t uHTSupport;
-	uint32_t uPowerLimit;
-	uint32_t uHeartBeatThresh;
-	uint32_t uJoinTimeOut;
 	tSirMacCapabilityInfo BssCap;
-	bool f11hSupport;
 	ePhyChanBondState cbMode;
 };
 
@@ -351,7 +343,6 @@ struct csr_roam_joinstatus {
 };
 
 struct csr_scanstruct {
-	tSirScanType curScanType;
 	struct csr_channel channels11d;
 	struct channel_power defaultPowerTable[CFG_VALID_CHANNEL_LIST_LEN];
 	uint32_t numChannelsDefault;
@@ -363,9 +354,6 @@ struct csr_scanstruct {
 	uint8_t countryCodeDefault[REG_ALPHA2_LEN + 1];
 	uint8_t countryCodeCurrent[REG_ALPHA2_LEN + 1];
 	uint8_t countryCode11d[REG_ALPHA2_LEN + 1];
-	v_REGDOMAIN_t domainIdDefault;  /* default regulatory domain */
-	v_REGDOMAIN_t domainIdCurrent;  /* current regulatory domain */
-
 	/*
 	 * in 11d IE from probe rsp or beacons of neighboring APs
 	 * will use the most popular one (max count)

core/sme/inc/csr_support.h

@@ -233,8 +233,7 @@ bool csr_is_infra_bss_desc(struct bss_description *pSirBssDesc);
 tSirResultCodes csr_get_de_auth_rsp_status_code(struct deauth_rsp *pSmeRsp);
 uint32_t csr_get_frag_thresh(struct mac_context *mac_ctx);
 uint32_t csr_get_rts_thresh(struct mac_context *mac_ctx);
-uint32_t csr_get11h_power_constraint(struct mac_context *mac_ctx,
-				     tDot11fIEPowerConstraints *constraints);
+
 uint8_t csr_construct_rsn_ie(struct mac_context *mac, uint32_t sessionId,
 			     struct csr_roam_profile *pProfile,
 			     struct bss_description *pSirBssDesc,

core/sme/inc/sme_api.h

@@ -2378,9 +2378,6 @@ QDF_STATUS sme_set_sar_power_limits(mac_handle_t mac_handle,
  */
 QDF_STATUS sme_send_coex_config_cmd(struct coex_config_params *coex_cfg_params);
 
-void sme_set_cc_src(mac_handle_t mac_handle, enum country_src);
-
-
 #ifdef WLAN_FEATURE_WOW_PULSE
 QDF_STATUS sme_set_wow_pulse(struct wow_pulse_mode *wow_pulse_set_info);
 #endif

core/sme/inc/sme_power_save.h

@@ -33,54 +33,6 @@
 #define AUTO_PS_ENTRY_TIMER_DEFAULT_VALUE 1000
 #define AUTO_PS_DEFER_TIMEOUT_MS 1500
 
-/**
- * enum ps_state - State of the power save
- * @FULL_POWER_MODE: for Full power mode
- * @LEGACY_POWER_SAVE_MODE: For Legacy Power Save mode
- * @UAPSD_MODE: for UAPSD power save
- */
-
-enum ps_state {
-	FULL_POWER_MODE,
-	LEGACY_POWER_SAVE_MODE,
-	UAPSD_MODE
-};
-
-/**
- * struct ps_params - maintain power save state and USAPD params
- * @mac_ctx: mac_ctx
- * @session_id: Session Id.
- * @ps_state : State of the power save
- * @uapsd_per_ac_trigger_enable_mask: dynamic UPASD mask setting
- *		derived from AddTS Rsp and DelTS frame.
- *		If a particular AC bit is set, it means AC is trigger  enabled.
- * @uapsd_per_ac_delivery_enable_mask: dynamic UPASD mask setting
- *		derived from AddTS Rsp and DelTs frame.
- *		If a particular AC bit is set, it means AC is delivery enabled.
- * @ac_admit_mask: used for AC downgrade. This is a dynamic mask
- *		setting which keep tracks of ACs being admitted.
- *		If bit is set to 0: That particular AC is not admitted
- *		If bit is set to 1: That particular AC is admitted
- * @uapsd_per_ac_bit_mask: This is a static UAPSD mask setting
- *		derived from SME_JOIN_REQ and SME_REASSOC_REQ.
- *		If a particular AC bit is set, it means the AC is both
- *		trigger enabled and delivery enabled.
- * @auto_ps_enable_timer: Upon expiration of this timer	Power Save Offload
- *		module will try to enable sta mode ps
- */
-
-struct ps_params {
-	void *mac_ctx;
-	uint32_t     session_id;
-	enum    ps_state ps_state;
-	uint8_t uapsd_per_ac_trigger_enable_mask;
-	uint8_t uapsd_per_ac_delivery_enable_mask;
-	uint8_t ac_admit_mask[SIR_MAC_DIRECTION_DIRECT];
-	uint8_t uapsd_per_ac_bit_mask;
-	qdf_mc_timer_t auto_ps_enable_timer;
-
-};
-
 /**
  * struct ps_global_info - global struct for Power save information
  * @ps_params: maintain power save state and USAPD params

core/sme/src/common/sme_api.c

@@ -5441,36 +5441,6 @@ QDF_STATUS sme_get_cfg_valid_channels(uint32_t *valid_ch_freq, uint32_t *len)
 	return status;
 }
 
-static uint8_t *sme_reg_hint_to_str(const enum country_src src)
-{
-	switch (src) {
-	case SOURCE_CORE:
-		return "WORLD MODE";
-
-	case SOURCE_DRIVER:
-		return "BDF file";
-
-	case SOURCE_USERSPACE:
-		return "user-space";
-
-	case SOURCE_11D:
-		return "802.11D IEs in beacons";
-
-	default:
-		return "unknown";
-	}
-}
-
-void sme_set_cc_src(mac_handle_t mac_handle, enum country_src cc_src)
-{
-	struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);
-
-	mac_ctx->reg_hint_src = cc_src;
-
-	sme_debug("Country source is %s",
-		  sme_reg_hint_to_str(cc_src));
-}
-
 /**
  * sme_handle_generic_change_country_code() - handles country ch req
  * @mac_ctx:    mac global context

core/sme/src/csr/csr_api_roam.c

@@ -432,9 +432,6 @@ QDF_STATUS csr_init_chan_list(struct mac_context *mac, uint8_t *alpha2)
 
 	sme_debug("init time country code %.2s", mac->scan.countryCodeDefault);
 
-	mac->scan.domainIdDefault = 0;
-	mac->scan.domainIdCurrent = 0;
-
 	qdf_mem_copy(mac->scan.countryCodeCurrent,
 		     mac->scan.countryCodeDefault, REG_ALPHA2_LEN + 1);
 	qdf_mem_copy(mac->scan.countryCodeElected,
@@ -1110,9 +1107,6 @@ QDF_STATUS csr_stop(struct mac_context *mac)
 		if (CSR_IS_SESSION_VALID(mac, sessionId))
 			ucfg_scan_flush_results(mac->pdev, NULL);
 
-	/* Reset the domain back to the deault */
-	mac->scan.domainIdCurrent = mac->scan.domainIdDefault;
-
 	for (sessionId = 0; sessionId < WLAN_MAX_VDEVS; sessionId++) {
 		csr_roam_state_change(mac, eCSR_ROAMING_STATE_STOP, sessionId);
 		csr_roam_substate_change(mac, eCSR_ROAM_SUBSTATE_NONE,
@@ -2086,8 +2080,6 @@ QDF_STATUS csr_change_default_config_param(struct mac_context *mac,
 		/* Assign this before calling csr_init11d_info */
 		if (wlan_reg_11d_enabled_on_host(mac->psoc))
 			status = csr_init11d_info(mac, &pParam->Csr11dinfo);
-		else
-			mac->scan.curScanType = eSIR_ACTIVE_SCAN;
 
 		/* Initialize the power + channel information if 11h is
 		 * enabled. If 11d is enabled this information has already
@@ -3173,6 +3165,7 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
 {
 	enum csr_cfgdot11mode cfgDot11Mode;
 	uint32_t join_timeout;
+	enum reg_wifi_band band;
 
 	QDF_ASSERT(pIes);
 	if (!pIes)
@@ -3206,11 +3199,11 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
 	}
 
 	if (WLAN_REG_IS_5GHZ_CH_FREQ(bss_desc->chan_freq))
-		pBssConfig->band = REG_BAND_5G;
+		band = REG_BAND_5G;
 	else if (WLAN_REG_IS_24GHZ_CH_FREQ(bss_desc->chan_freq))
-		pBssConfig->band = REG_BAND_2G;
+		band = REG_BAND_2G;
 	else if (WLAN_REG_IS_6GHZ_CHAN_FREQ(bss_desc->chan_freq))
-		pBssConfig->band = REG_BAND_6G;
+		band = REG_BAND_6G;
 	else
 		return QDF_STATUS_E_FAILURE;
 
@@ -3224,7 +3217,7 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
 		 * 2.4Ghz and to 11a mode for 5Ghz
 		 */
 		sme_warn("Can not find match phy mode");
-		if (REG_BAND_2G == pBssConfig->band) {
+		if (REG_BAND_2G == band) {
 			if (mac->roam.configParam.phyMode &
 			    (eCSR_DOT11_MODE_11b | eCSR_DOT11_MODE_11b_ONLY)) {
 				pBssConfig->uCfgDot11Mode =
@@ -3233,9 +3226,9 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
 				pBssConfig->uCfgDot11Mode =
 						eCSR_CFG_DOT11_MODE_11G;
 			}
-		} else if (pBssConfig->band == REG_BAND_5G) {
+		} else if (band == REG_BAND_5G) {
 			pBssConfig->uCfgDot11Mode = eCSR_CFG_DOT11_MODE_11A;
-		} else if (pBssConfig->band == REG_BAND_6G) {
+		} else if (band == REG_BAND_6G) {
 			pBssConfig->uCfgDot11Mode =
 						eCSR_CFG_DOT11_MODE_11AX_ONLY;
 		}
@@ -3286,36 +3279,27 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
 	}
 	/* short slot time */
 	if (eCSR_CFG_DOT11_MODE_11B != cfgDot11Mode)
-		pBssConfig->uShortSlotTime =
+		mac->mlme_cfg->feature_flags.enable_short_slot_time_11g =
 			mac->mlme_cfg->ht_caps.short_slot_time_enabled;
 	else
-		pBssConfig->uShortSlotTime = 0;
+		mac->mlme_cfg->feature_flags.enable_short_slot_time_11g = 0;
 
-	pBssConfig->f11hSupport =
-			mac->mlme_cfg->gen.enabled_11h;
 	/* power constraint */
-	pBssConfig->uPowerLimit =
-		csr_get11h_power_constraint(mac, &pIes->PowerConstraints);
-	/* heartbeat */
-	if (CSR_IS_11A_BSS(bss_desc))
-		pBssConfig->uHeartBeatThresh =
-			mac->roam.configParam.HeartbeatThresh50;
-	else
-		pBssConfig->uHeartBeatThresh =
-			mac->mlme_cfg->timeouts.heart_beat_threshold;
+	mac->mlme_cfg->power.local_power_constraint =
+		wlan_get_11h_power_constraint(mac, &pIes->PowerConstraints);
 
 	/*
 	 * Join timeout: if we find a BeaconInterval in the BssDescription,
 	 * then set the Join Timeout to be 10 x the BeaconInterval.
 	 */
-	pBssConfig->uJoinTimeOut = cfg_default(CFG_JOIN_FAILURE_TIMEOUT);
-	if (bss_desc->beaconInterval) {
+	join_timeout = cfg_default(CFG_JOIN_FAILURE_TIMEOUT);
+	if (bss_desc->beaconInterval)
 		/* Make sure it is bigger than the minimal */
 		join_timeout = QDF_MAX(10 * bss_desc->beaconInterval,
 				       cfg_min(CFG_JOIN_FAILURE_TIMEOUT));
-		if (join_timeout < pBssConfig->uJoinTimeOut)
-			pBssConfig->uJoinTimeOut = join_timeout;
-	}
+
+	mac->mlme_cfg->timeouts.join_failure_timeout =
+		QDF_MIN(join_timeout, cfg_default(CFG_JOIN_FAILURE_TIMEOUT));
 
 	/* validate CB */
 	if ((pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11N) ||
@@ -3347,6 +3331,8 @@ QDF_STATUS csr_roam_prepare_bss_config_from_profile(
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	uint32_t bss_op_ch_freq = 0;
 	uint8_t qAPisEnabled = false;
+	enum reg_wifi_band band;
+
 	/* SSID */
 	pBssConfig->SSID.length = 0;
 	if (pProfile->SSIDs.numOfSSIDs) {
@@ -3365,15 +3351,12 @@ QDF_STATUS csr_roam_prepare_bss_config_from_profile(
 	    pProfile->EncryptionType.encryptionType[0])
 		pBssConfig->BssCap.privacy = 1;
 
-	/* Update when 6G support is added for NDI */
-	pBssConfig->band = (mac->mlme_cfg->gen.band == BAND_2G ?
-			    REG_BAND_2G : REG_BAND_5G);
 	/* phymode */
 	if (pProfile->ChannelInfo.freq_list)
 		bss_op_ch_freq = pProfile->ChannelInfo.freq_list[0];
 	pBssConfig->uCfgDot11Mode = csr_roam_get_phy_mode_band_for_bss(
 						mac, pProfile, bss_op_ch_freq,
-						&pBssConfig->band);
+						&band);
 	/* QOS */
 	/* Is this correct to always set to this // *** */
 	if (pBssConfig->BssCap.ess == 1) {
@@ -3424,24 +3407,11 @@ QDF_STATUS csr_roam_prepare_bss_config_from_profile(
 	}
 	/* short slot time */
 	if (WNI_CFG_PHY_MODE_11B != pBssConfig->uCfgDot11Mode) {
-		pBssConfig->uShortSlotTime =
+		mac->mlme_cfg->feature_flags.enable_short_slot_time_11g =
 			mac->mlme_cfg->ht_caps.short_slot_time_enabled;
 	} else {
-		pBssConfig->uShortSlotTime = 0;
-	}
-	pBssConfig->f11hSupport = false;
-	pBssConfig->uPowerLimit = 0;
-	/* heartbeat */
-	if (REG_BAND_5G == pBssConfig->band ||
-	    REG_BAND_6G == pBssConfig->band) {
-		pBssConfig->uHeartBeatThresh =
-			mac->roam.configParam.HeartbeatThresh50;
-	} else {
-		pBssConfig->uHeartBeatThresh =
-			mac->mlme_cfg->timeouts.heart_beat_threshold;
+		mac->mlme_cfg->feature_flags.enable_short_slot_time_11g = 0;
 	}
-	/* Join timeout */
-	pBssConfig->uJoinTimeOut = cfg_default(CFG_JOIN_FAILURE_TIMEOUT);
 
 	return status;
 }
@@ -4043,12 +4013,6 @@ QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac, uint32_t session
 	 * Do we need to worry about sequence for OSs that are not Windows??
 	 */
 	if (bss_desc) {
-		if ((wlan_get_opmode_from_vdev_id(mac->pdev, sessionId) !=
-		      QDF_SAP_MODE) &&
-		     csr_learn_11dcountry_information(mac,
-						      bss_desc, pIes, true)) {
-			csr_apply_country_information(mac);
-		}
 		if ((wlan_reg_11d_enabled_on_host(mac->psoc)) && pIes) {
 			if (!pIes->Country.present)
 				csr_apply_channel_power_info_wrapper(mac);
@@ -4064,11 +4028,6 @@ QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac, uint32_t session
 
 	/* encryption type */
 	csr_set_cfg_privacy(mac, pProfile, (bool) pBssConfig->BssCap.privacy);
-	/* short slot time */
-	mac->mlme_cfg->feature_flags.enable_short_slot_time_11g =
-						pBssConfig->uShortSlotTime;
-
-	mac->mlme_cfg->power.local_power_constraint = pBssConfig->uPowerLimit;
 	/* CB */
 
 	if (CSR_IS_INFRA_AP(pProfile))
@@ -4090,9 +4049,6 @@ QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac, uint32_t session
 	else
 		csr_set_cfg_rate_set_from_profile(mac, pProfile, sessionId);
 
-	mac->mlme_cfg->timeouts.join_failure_timeout =
-		pBssConfig->uJoinTimeOut;
-
 	/* Any roaming related changes should be above this line */
 	if (MLME_IS_ROAM_SYNCH_IN_PROGRESS(mac->psoc, sessionId)) {
 		sme_debug("LFR3: Roam synch is in progress Session_id: %d",
@@ -13078,6 +13034,14 @@ QDF_STATUS cm_csr_handle_connect_req(struct wlan_objmgr_vdev *vdev,
 		return QDF_STATUS_E_FAILURE;
 	}
 
+	csr_set_qos_to_cfg(mac_ctx, vdev_id,
+			   csr_get_qos_from_bss_desc(mac_ctx, bss_desc,
+						     ie_struct));
+
+	if ((wlan_reg_11d_enabled_on_host(mac_ctx->psoc)) &&
+	     !ie_struct->Country.present)
+		csr_apply_channel_power_info_wrapper(mac_ctx);
+
 	status = csr_get_rate_set(mac_ctx, ie_struct, &op_rate_set,
 				  &ext_rate_set);
 
@@ -13681,35 +13645,6 @@ csr_validate_and_update_fils_info(struct mac_context *mac,
 }
 #endif
 
-#if defined(WLAN_FEATURE_11AX) && defined(WLAN_SUPPORT_TWT)
-/**
- * csr_enable_twt() - Check if its allowed to enable twt for this session
- * @ie: pointer to beacon/probe resp ie's
- *
- * TWT is allowed only if device is in 11ax mode and peer supports
- * TWT responder or if QCN ie present.
- *
- * Return: true or flase
- */
-static bool csr_enable_twt(struct mac_context *mac_ctx, tDot11fBeaconIEs *ie)
-{
-
-	if (mac_ctx->mlme_cfg->he_caps.dot11_he_cap.twt_request && ie &&
-	    (ie->qcn_ie.present || ie->he_cap.twt_responder)) {
-		sme_debug("TWT is supported, hence disable UAPSD; twt req supp: %d,twt respon supp: %d, QCN_IE: %d",
-			  mac_ctx->mlme_cfg->he_caps.dot11_he_cap.twt_request,
-			  ie->he_cap.twt_responder, ie->qcn_ie.present);
-		return true;
-	}
-	return false;
-}
-#else
-static bool csr_enable_twt(struct mac_context *mac_ctx, tDot11fBeaconIEs *ie)
-{
-	return false;
-}
-#endif
-
 static void csr_get_basic_rates(tSirMacRateSet *b_rates, uint32_t chan_freq)
 {
 	/*
@@ -13821,8 +13756,6 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 	uint32_t dot11mode = 0;
 	uint8_t *wpaRsnIE = NULL;
 	struct join_req *csr_join_req;
-	struct ps_global_info *ps_global_info = &mac->sme.ps_global_info;
-	struct ps_params *ps_param = &ps_global_info->ps_params[sessionId];
 	tpCsrNeighborRoamControlInfo neigh_roam_info;
 	enum csr_akm_type akm;
 	uint8_t programmed_country[REG_ALPHA2_LEN + 1];
@@ -13939,8 +13872,7 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 		status =
 			csr_get_rate_set(mac, pIes, &OpRateSet,
 					 &ExRateSet);
-		if (!csr_enable_twt(mac, pIes))
-			ps_param->uapsd_per_ac_bit_mask = pProfile->uapsd_mask;
+
 		if (QDF_IS_STATUS_SUCCESS(status)) {
 			/* OperationalRateSet */
 			if (OpRateSet.numRates) {

core/sme/src/csr/csr_api_scan.c

@@ -623,138 +623,6 @@ void csr_apply_channel_power_info_wrapper(struct mac_context *mac)
 	qdf_mem_zero(&mac->scan.channels11d, sizeof(mac->scan.channels11d));
 }
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
-/* caller allocated memory for pNumChn and pChnPowerInfo */
-/* As input, *pNumChn has the size of the array of pChnPowerInfo */
-/* Upon return, *pNumChn has the number of channels assigned. */
-static void csr_get_channel_power_info(struct mac_context *mac,
-				       tDblLinkList *list,
-				       uint32_t *num_ch,
-				       struct channel_power *chn_pwr_info)
-{
-	tListElem *entry;
-	uint32_t chn_idx = 0, idx;
-	struct csr_channel_powerinfo *ch_set;
-
-	/* Get 2.4Ghz first */
-	csr_ll_lock(list);
-	entry = csr_ll_peek_head(list, LL_ACCESS_NOLOCK);
-	while (entry && (chn_idx < *num_ch)) {
-		ch_set = GET_BASE_ADDR(entry,
-				struct csr_channel_powerinfo, link);
-		for (idx = 0; (idx < ch_set->numChannels)
-				&& (chn_idx < *num_ch); idx++) {
-			chn_pwr_info[chn_idx].chan_num =
-				(uint8_t)wlan_reg_freq_to_chan(
-					mac->pdev,
-					ch_set->first_chan_freq +
-					idx * ch_set->interChannelOffset);
-			chn_pwr_info[chn_idx++].tx_power = ch_set->txPower;
-		}
-		entry = csr_ll_next(list, entry, LL_ACCESS_NOLOCK);
-	}
-	csr_ll_unlock(list);
-	*num_ch = chn_idx;
-}
-
-static void csr_diag_apply_country_info(struct mac_context *mac_ctx)
-{
-	host_log_802_11d_pkt_type *p11dLog;
-	struct channel_power *chan_pwr_info;
-	uint32_t n_chan_info = CFG_VALID_CHANNEL_LIST_LEN;
-	uint32_t i;
-
-	WLAN_HOST_DIAG_LOG_ALLOC(p11dLog, host_log_802_11d_pkt_type,
-				 LOG_WLAN_80211D_C);
-	if (!p11dLog)
-		return;
-
-	p11dLog->eventId = WLAN_80211D_EVENT_COUNTRY_SET;
-	qdf_mem_copy(p11dLog->countryCode, mac_ctx->scan.countryCode11d, 3);
-	p11dLog->numChannel = mac_ctx->scan.channels11d.numChannels;
-	if (p11dLog->numChannel > HOST_LOG_MAX_NUM_CHANNEL)
-		goto diag_end;
-
-	chan_pwr_info = qdf_mem_malloc(sizeof(*chan_pwr_info) *
-				       CFG_VALID_CHANNEL_LIST_LEN);
-	if (!chan_pwr_info) {
-		sme_err("memory allocation failed for chan_pwr_info");
-		return;
-	}
-
-	for (i = 0; i < p11dLog->numChannel; i++)
-		p11dLog->Channels[i] =
-		wlan_reg_freq_to_chan(mac_ctx->pdev,
-				      mac_ctx->scan.channels11d.channel_freq_list[i]);
-	csr_get_channel_power_info(mac_ctx,
-				   &mac_ctx->scan.channelPowerInfoList24,
-				   &n_chan_info, chan_pwr_info);
-	n_chan_info = CFG_VALID_CHANNEL_LIST_LEN - n_chan_info;
-	csr_get_channel_power_info(mac_ctx,
-				   &mac_ctx->scan.channelPowerInfoList5G,
-				   &n_chan_info, &chan_pwr_info[n_chan_info]);
-	for (i = 0; i < p11dLog->numChannel; i++) {
-		for (n_chan_info = 0;
-		     n_chan_info < CFG_VALID_CHANNEL_LIST_LEN;
-		     n_chan_info++) {
-			if (p11dLog->Channels[i] ==
-			    chan_pwr_info[n_chan_info].chan_num) {
-				p11dLog->TxPwr[i] =
-					chan_pwr_info[n_chan_info].tx_power;
-				break;
-			}
-		}
-	}
-
-	qdf_mem_free(chan_pwr_info);
-
-diag_end:
-	if (!mac_ctx->mlme_cfg->gen.enabled_11d)
-		p11dLog->supportMultipleDomain = WLAN_80211D_DISABLED;
-	else
-		p11dLog->supportMultipleDomain =
-				WLAN_80211D_SUPPORT_MULTI_DOMAIN;
-	WLAN_HOST_DIAG_LOG_REPORT(p11dLog);
-}
-#endif /* #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR */
-
-/**
- * csr_apply_country_information() - apply country code information
- * @mac: core MAC data structure
- *
- * This function programs the new country code
- *
- * Return: none
- */
-void csr_apply_country_information(struct mac_context *mac)
-{
-	v_REGDOMAIN_t domainId;
-	QDF_STATUS status = QDF_STATUS_SUCCESS;
-
-	if (!wlan_reg_11d_enabled_on_host(mac->psoc))
-		return;
-	status = csr_get_regulatory_domain_for_country(mac,
-			mac->scan.countryCode11d, &domainId, SOURCE_QUERY);
-	if (!QDF_IS_STATUS_SUCCESS(status))
-		return;
-	/* Check whether we need to enforce default domain */
-#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
-	csr_diag_apply_country_info(mac);
-#endif /* #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR */
-
-	if (mac->scan.domainIdCurrent != domainId)
-		return;
-	if (mac->scan.domainIdCurrent != domainId) {
-		sme_debug("Domain Changed Old %d, new %d",
-			mac->scan.domainIdCurrent, domainId);
-		if (domainId >= REGDOMAIN_COUNT)
-			sme_err("fail to set regId %d", domainId);
-	}
-	mac->scan.domainIdCurrent = domainId;
-	/* switch to active scans using this new channel list */
-	mac->scan.curScanType = eSIR_ACTIVE_SCAN;
-}
-
 void csr_save_channel_power_for_band(struct mac_context *mac, bool fill_5f)
 {
 	uint32_t idx, count = 0;
@@ -819,77 +687,6 @@ bool csr_is_supported_channel(struct mac_context *mac, uint32_t chan_freq)
 	return fRet;
 }
 
-/*
- * 802.11D only: Gather 11d IE via beacon or Probe response and store them in
- * pAdapter->channels11d
- */
-bool csr_learn_11dcountry_information(struct mac_context *mac,
-				      struct bss_description *pSirBssDesc,
-				      tDot11fBeaconIEs *pIes, bool fForce)
-{
-	QDF_STATUS status;
-	uint8_t *pCountryCodeSelected;
-	bool fRet = false;
-	v_REGDOMAIN_t domainId;
-	tDot11fBeaconIEs *pIesLocal = pIes;
-	bool useVoting = false;
-
-	if ((!pSirBssDesc) && (!pIes))
-		useVoting = true;
-
-	/* check if .11d support is enabled */
-	if (!wlan_reg_11d_enabled_on_host(mac->psoc))
-		goto free_ie;
-
-	if (false == useVoting) {
-		if (!pIesLocal &&
-		   (!QDF_IS_STATUS_SUCCESS(
-			csr_get_parsed_bss_description_ies(
-				mac, pSirBssDesc, &pIesLocal))))
-			goto free_ie;
-		/* check if country information element is present */
-		if (!pIesLocal->Country.present)
-			/* No country info */
-			goto free_ie;
-		status = csr_get_regulatory_domain_for_country(mac,
-				pIesLocal->Country.country, &domainId,
-				SOURCE_QUERY);
-		if (QDF_IS_STATUS_SUCCESS(status)
-		    && (domainId == REGDOMAIN_WORLD))
-			goto free_ie;
-	} /* useVoting == false */
-
-	if (false == useVoting)
-		pCountryCodeSelected = pIesLocal->Country.country;
-	else
-		pCountryCodeSelected = mac->scan.countryCodeElected;
-
-	if (qdf_mem_cmp(pCountryCodeSelected, mac->scan.countryCodeCurrent,
-			CDS_COUNTRY_CODE_LEN) == 0) {
-		qdf_mem_copy(mac->scan.countryCode11d,
-			     mac->scan.countryCodeCurrent,
-			     CDS_COUNTRY_CODE_LEN);
-		goto free_ie;
-	}
-
-	mac->reg_hint_src = SOURCE_11D;
-	status = csr_get_regulatory_domain_for_country(mac,
-				pCountryCodeSelected, &domainId, SOURCE_11D);
-	if (status != QDF_STATUS_SUCCESS) {
-		sme_err("fail to get regId %d", domainId);
-		fRet = false;
-		goto free_ie;
-	}
-
-	fRet = true;
-free_ie:
-	if (!pIes && pIesLocal) {
-		/* locally allocated */
-		qdf_mem_free(pIesLocal);
-	}
-	return fRet;
-}
-
 #ifndef FEATURE_CM_ENABLE
 static enum csr_scancomplete_nextcommand
 csr_scan_get_next_command_state(struct mac_context *mac_ctx,

core/sme/src/csr/csr_inside_api.h

@@ -180,12 +180,6 @@ QDF_STATUS csr_scan_for_ssid(struct mac_context *mac, uint32_t sessionId,
 QDF_STATUS csr_scan_abort_mac_scan(struct mac_context *mac, uint32_t vdev_id,
 				   uint32_t scan_id);
 
-/* If fForce is true we will save the new String that is learn't. */
-/* Typically it will be true in case of Join or user initiated ioctl */
-bool csr_learn_11dcountry_information(struct mac_context *mac,
-				   struct bss_description *pSirBssDesc,
-				   tDot11fBeaconIEs *pIes, bool fForce);
-void csr_apply_country_information(struct mac_context *mac);
 void csr_free_scan_result_entry(struct mac_context *mac, struct tag_csrscan_result
 				*pResult);
 

core/sme/src/csr/csr_util.c

@@ -1973,21 +1973,6 @@ eCsrPhyMode csr_convert_from_reg_phy_mode(enum reg_phymode phymode)
 	}
 }
 
-uint32_t csr_get11h_power_constraint(struct mac_context *mac_ctx,
-				     tDot11fIEPowerConstraints *constraints)
-{
-	uint32_t localPowerConstraint = 0;
-
-	/* check if .11h support is enabled, if not,
-	 * the power constraint is 0.
-	 */
-	if (mac_ctx->mlme_cfg->gen.enabled_11h &&
-	    constraints->present)
-		localPowerConstraint = constraints->localPowerConstraints;
-
-	return localPowerConstraint;
-}
-
 #ifndef FEATURE_CM_ENABLE
 bool csr_is_profile_wpa(struct csr_roam_profile *pProfile)
 {