qcacld-3.0: Move nss, oui from CSR to LIM

Move nss and oui support from CSR to LIM

Change-Id: I7ced4b5951b0525a492dd641846305582f0613f2
CRs-Fixed: 2827097

core/mac/inc/sir_api.h

@@ -958,9 +958,6 @@ struct join_req {
 	bool force_24ghz_in_ht20;
 	bool force_rsne_override;
 	bool supported_nss_1x1;
-	uint8_t vdev_nss;
-	uint8_t nss;
-	bool nss_forced_1x1;
 	bool enable_session_twt_support;
 	struct bss_description bssDescription;
 	/*

core/mac/src/include/parser_api.h

@@ -1250,4 +1250,33 @@ static inline uint32_t lim_truncate_ppet(uint8_t *ppet, uint32_t max_len)
 	}
 	return max_len;
 }
+
+QDF_STATUS wlan_parse_bss_description_ies(struct mac_context *mac_ctx,
+					  struct bss_description *bss_desc,
+					  tDot11fBeaconIEs *ie_struct);
+
+QDF_STATUS
+wlan_get_parsed_bss_description_ies(struct mac_context *mac_ctx,
+				    struct bss_description *bss_desc,
+				    tDot11fBeaconIEs **ie_struct);
+
+QDF_STATUS
+wlan_fill_bss_desc_from_scan_entry(struct mac_context *mac_ctx,
+				   struct bss_description *bss_desc,
+				   struct scan_cache_entry *scan_entry);
+
+/**
+ * wlan_get_ielen_from_bss_description() - to get IE length
+ * from struct bss_description structure
+ * @pBssDescr: pBssDescr
+ *
+ * This function is called in various places to get IE length
+ * from struct bss_description structure
+ *
+ * @Return: total IE length
+ */
+uint16_t
+wlan_get_ielen_from_bss_description(struct bss_description *bss_desc);
+
+
 #endif /* __PARSE_H__ */

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

@@ -57,6 +57,7 @@
 #include "../../core/src/vdev_mgr_ops.h"
 #include "wma.h"
 #include <../../core/src/wlan_cm_vdev_api.h>
+#include <wlan_action_oui_ucfg_api.h>
 
 /* SME REQ processing function templates */
 static bool __lim_process_sme_sys_ready_ind(struct mac_context *, uint32_t *);
@@ -1543,6 +1544,332 @@ static inline bool lim_is_ese_enabled(struct mac_context *mac_ctx)
 }
 #endif
 
+/**
+ * lim_get_nss_supported_by_sta_and_ap() - finds out nss from session
+ * and beacon from AP
+ * @vht_caps: VHT capabilities
+ * @ht_caps: HT capabilities
+ * @dot11_mode: dot11 mode
+ *
+ * Return: number of nss advertised by beacon
+ */
+static uint8_t
+lim_get_nss_supported_by_sta_and_ap(tDot11fIEVHTCaps *vht_caps,
+				    tDot11fIEHTCaps *ht_caps,
+				    tDot11fIEhe_cap *he_cap,
+				    enum mlme_dot11_mode dot11_mode)
+{
+	bool vht_capability, ht_capability, he_capability;
+
+	vht_capability = IS_DOT11_MODE_VHT(dot11_mode);
+	ht_capability = IS_DOT11_MODE_HT(dot11_mode);
+	he_capability = IS_DOT11_MODE_HE(dot11_mode);
+
+	if (he_capability && he_cap->present) {
+		if ((he_cap->rx_he_mcs_map_lt_80 & 0xC0) != 0xC0)
+			return NSS_4x4_MODE;
+
+		if ((he_cap->rx_he_mcs_map_lt_80 & 0x30) != 0x30)
+			return NSS_3x3_MODE;
+
+		if ((he_cap->rx_he_mcs_map_lt_80 & 0x0C) != 0x0C)
+			return NSS_2x2_MODE;
+	} else if (vht_capability && vht_caps->present) {
+		if ((vht_caps->rxMCSMap & 0xC0) != 0xC0)
+			return NSS_4x4_MODE;
+
+		if ((vht_caps->rxMCSMap & 0x30) != 0x30)
+			return NSS_3x3_MODE;
+
+		if ((vht_caps->rxMCSMap & 0x0C) != 0x0C)
+			return NSS_2x2_MODE;
+	} else if (ht_capability && ht_caps->present) {
+		if (ht_caps->supportedMCSSet[3])
+			return NSS_4x4_MODE;
+
+		if (ht_caps->supportedMCSSet[2])
+			return NSS_3x3_MODE;
+
+		if (ht_caps->supportedMCSSet[1])
+			return NSS_2x2_MODE;
+	}
+
+	return NSS_1x1_MODE;
+}
+
+/**
+ * lim_check_vendor_ap_3_present() - Check if Vendor AP 3 is present
+ * @mac_ctx: Pointer to Global MAC structure
+ * @ie: Pointer to starting IE in Beacon/Probe Response
+ * @ie_len: Length of all IEs combined
+ *
+ * For Vendor AP 3, the condition is that Vendor AP 3 IE should be present
+ * and Vendor AP 4 IE should not be present.
+ * If Vendor AP 3 IE is present and Vendor AP 4 IE is also present,
+ * return false, else return true.
+ *
+ * Return: true or false
+ */
+static bool
+lim_check_vendor_ap_3_present(struct mac_context *mac_ctx, uint8_t *ie,
+			      uint16_t ie_len)
+{
+	bool ret = true;
+
+	if ((wlan_get_vendor_ie_ptr_from_oui(SIR_MAC_VENDOR_AP_3_OUI,
+	    SIR_MAC_VENDOR_AP_3_OUI_LEN, ie, ie_len)) &&
+	    (wlan_get_vendor_ie_ptr_from_oui(SIR_MAC_VENDOR_AP_4_OUI,
+	    SIR_MAC_VENDOR_AP_4_OUI_LEN, ie, ie_len))) {
+		pe_debug("Vendor OUI 3 and Vendor OUI 4 found");
+		ret = false;
+	}
+
+	return ret;
+}
+
+#ifdef WLAN_FEATURE_11AX
+static void
+lim_handle_iot_ap_no_common_he_rates(struct mac_context *mac,
+				     struct pe_session *session,
+				     tDot11fBeaconIEs *ies)
+{
+	uint16_t int_mcs;
+	struct wlan_objmgr_vdev *vdev = session->vdev;
+	struct mlme_legacy_priv *mlme_priv;
+
+	/* if the connection is not 11AX mode then return */
+	if (session->dot11mode != MLME_DOT11_MODE_11AX)
+		return;
+
+	mlme_priv = wlan_vdev_mlme_get_ext_hdl(vdev);
+	if (!mlme_priv)
+		return;
+
+	int_mcs = HE_INTERSECT_MCS(mlme_priv->he_config.tx_he_mcs_map_lt_80,
+				   ies->he_cap.rx_he_mcs_map_lt_80);
+	pe_debug("HE self rates %x AP rates %x int_mcs %x vendorIE %d",
+		 mlme_priv->he_config.rx_he_mcs_map_lt_80,
+		 ies->he_cap.rx_he_mcs_map_lt_80, int_mcs,
+		 ies->vendor_vht_ie.present);
+	if (ies->he_cap.present)
+		if ((int_mcs == 0xFFFF) &&
+		    (ies->vendor_vht_ie.present ||
+		     ies->VHTCaps.present)) {
+			session->dot11mode = MLME_DOT11_MODE_11AC;
+			sme_debug("No common 11AX rate. Force 11AC connection");
+	}
+}
+#else
+static void lim_handle_iot_ap_no_common_he_rates(struct mac_context *mac,
+					struct pe_session *session,
+					tDot11fBeaconIEs *ies)
+{
+}
+#endif
+
+#ifdef WLAN_FEATURE_11AX
+static void
+lim_update_he_caps_mcs(struct mac_context *mac, struct pe_session *session)
+{
+	uint32_t tx_mcs_map = 0;
+	uint32_t rx_mcs_map = 0;
+	uint32_t mcs_map = 0;
+	struct wlan_objmgr_vdev *vdev = session->vdev;
+	struct mlme_legacy_priv *mlme_priv;
+	struct wlan_mlme_cfg *mlme_cfg = mac->mlme_cfg;
+
+	mlme_priv = wlan_vdev_mlme_get_ext_hdl(vdev);
+	if (!mlme_priv)
+		return;
+
+	rx_mcs_map = mlme_cfg->he_caps.dot11_he_cap.rx_he_mcs_map_lt_80;
+	tx_mcs_map = mlme_cfg->he_caps.dot11_he_cap.tx_he_mcs_map_lt_80;
+	mcs_map = rx_mcs_map & 0x3;
+
+	if (session->nss == 1) {
+		tx_mcs_map = HE_SET_MCS_4_NSS(tx_mcs_map, HE_MCS_DISABLE, 2);
+		rx_mcs_map = HE_SET_MCS_4_NSS(rx_mcs_map, HE_MCS_DISABLE, 2);
+	} else {
+		tx_mcs_map = HE_SET_MCS_4_NSS(tx_mcs_map, mcs_map, 2);
+		rx_mcs_map = HE_SET_MCS_4_NSS(rx_mcs_map, mcs_map, 2);
+	}
+	pe_debug("new HE Nss MCS MAP: Rx 0x%0X, Tx: 0x%0X",
+		  rx_mcs_map, tx_mcs_map);
+	mlme_priv->he_config.tx_he_mcs_map_lt_80 = tx_mcs_map;
+	mlme_priv->he_config.rx_he_mcs_map_lt_80 = rx_mcs_map;
+}
+#else
+static void
+lim_update_he_caps_mcs(struct mac_context *mac, struct pe_session *session)
+{
+}
+#endif
+
+static void lim_check_oui_and_update_session(struct mac_context *mac_ctx,
+					     struct pe_session *session)
+{
+	struct action_oui_search_attr vendor_ap_search_attr;
+	uint16_t ie_len;
+	bool force_max_nss, follow_ap_edca;
+	tDot11fBeaconIEs *ie_struct;
+	struct bss_description *bss_desc =
+					&session->lim_join_req->bssDescription;
+	bool is_vendor_ap_present;
+	uint8_t ap_nss;
+	struct vdev_type_nss *vdev_type_nss;
+	QDF_STATUS status;
+
+	if (wlan_reg_is_5ghz_ch_freq(bss_desc->chan_freq))
+		vdev_type_nss = &mac_ctx->vdev_type_nss_5g;
+	else
+		vdev_type_nss = &mac_ctx->vdev_type_nss_2g;
+
+	if (wlan_vdev_mlme_get_opmode(session->vdev) == QDF_P2P_CLIENT_MODE)
+		session->vdev_nss = vdev_type_nss->p2p_cli;
+	else
+		session->vdev_nss = vdev_type_nss->sta;
+	session->nss = session->vdev_nss;
+
+	status = wlan_get_parsed_bss_description_ies(mac_ctx, bss_desc,
+						     &ie_struct);
+
+	if (QDF_IS_STATUS_ERROR(status)) {
+		pe_err("IE parsing failed vdev id %d", session->vdev_id);
+		return;
+	}
+
+	ie_len = wlan_get_ielen_from_bss_description(bss_desc);
+
+	/* Fill the Vendor AP search params */
+	vendor_ap_search_attr.ie_data =
+			(uint8_t *)&bss_desc->ieFields[0];
+	vendor_ap_search_attr.ie_length = ie_len;
+	vendor_ap_search_attr.mac_addr = &bss_desc->bssId[0];
+	ap_nss = lim_get_nss_supported_by_sta_and_ap(
+					&ie_struct->VHTCaps, &ie_struct->HTCaps,
+					&ie_struct->he_cap, session->dot11mode);
+	vendor_ap_search_attr.nss = ap_nss;
+	vendor_ap_search_attr.ht_cap = ie_struct->HTCaps.present;
+	vendor_ap_search_attr.vht_cap = ie_struct->VHTCaps.present;
+	vendor_ap_search_attr.enable_2g =
+				wlan_reg_is_24ghz_ch_freq(bss_desc->chan_freq);
+	vendor_ap_search_attr.enable_5g =
+				wlan_reg_is_5ghz_ch_freq(bss_desc->chan_freq);
+
+	force_max_nss = ucfg_action_oui_search(mac_ctx->psoc,
+					&vendor_ap_search_attr,
+					ACTION_OUI_FORCE_MAX_NSS);
+
+	if (!mac_ctx->mlme_cfg->vht_caps.vht_cap_info.enable2x2) {
+		force_max_nss = false;
+		session->nss = 1;
+		session->vdev_nss = 1;
+	}
+
+	if (!force_max_nss && session->nss > ap_nss) {
+		session->nss = ap_nss;
+		session->vdev_nss = ap_nss;
+	}
+
+	/*
+	 * If CCK WAR is set for current AP, update to firmware via
+	 * WMI_VDEV_PARAM_ABG_MODE_TX_CHAIN_NUM
+	 */
+	is_vendor_ap_present =
+			ucfg_action_oui_search(mac_ctx->psoc,
+					       &vendor_ap_search_attr,
+					       ACTION_OUI_CCKM_1X1);
+	if (is_vendor_ap_present) {
+		pe_debug("vdev: %d WMI_VDEV_PARAM_ABG_MODE_TX_CHAIN_NUM 1",
+			 session->vdev_id);
+		wma_cli_set_command(session->vdev_id,
+			(int)WMI_VDEV_PARAM_ABG_MODE_TX_CHAIN_NUM, 1,
+			VDEV_CMD);
+	}
+
+	/*
+	 * If Switch to 11N WAR is set for current AP, change dot11
+	 * mode to 11N.
+	 */
+	is_vendor_ap_present =
+		ucfg_action_oui_search(mac_ctx->psoc,
+				       &vendor_ap_search_attr,
+				       ACTION_OUI_SWITCH_TO_11N_MODE);
+	if (mac_ctx->roam.configParam.is_force_1x1 &&
+	    mac_ctx->mlme_cfg->gen.as_enabled &&
+	    is_vendor_ap_present &&
+	    (session->dot11mode == MLME_DOT11_MODE_ALL ||
+	     session->dot11mode == MLME_DOT11_MODE_11AC ||
+	     session->dot11mode == MLME_DOT11_MODE_11AC_ONLY))
+		session->dot11mode = MLME_DOT11_MODE_11N;
+
+	follow_ap_edca = ucfg_action_oui_search(mac_ctx->psoc,
+				    &vendor_ap_search_attr,
+				    ACTION_OUI_DISABLE_AGGRESSIVE_EDCA);
+	mlme_set_follow_ap_edca_flag(session->vdev, follow_ap_edca);
+
+	if (ucfg_action_oui_search(mac_ctx->psoc, &vendor_ap_search_attr,
+				   ACTION_OUI_HOST_RECONN)) {
+		mlme_set_reconn_after_assoc_timeout_flag(
+			mac_ctx->psoc, session->vdev_id,
+			true);
+	}
+	is_vendor_ap_present =
+			ucfg_action_oui_search(mac_ctx->psoc,
+					       &vendor_ap_search_attr,
+					       ACTION_OUI_CONNECT_1X1);
+
+	if (is_vendor_ap_present) {
+		is_vendor_ap_present = lim_check_vendor_ap_3_present(
+					mac_ctx,
+					vendor_ap_search_attr.ie_data,
+					ie_len);
+	}
+
+	/*
+	 * For WMI_ACTION_OUI_CONNECT_1x1_WITH_1_CHAIN, the host
+	 * sends the NSS as 1 to the FW and the FW then decides
+	 * after receiving the first beacon after connection to
+	 * switch to 1 Tx/Rx Chain.
+	 */
+
+	if (!is_vendor_ap_present) {
+		is_vendor_ap_present =
+			ucfg_action_oui_search(mac_ctx->psoc,
+				&vendor_ap_search_attr,
+				ACTION_OUI_CONNECT_1X1_WITH_1_CHAIN);
+		if (is_vendor_ap_present)
+			pe_debug("1x1 with 1 Chain AP");
+	}
+
+	if (is_vendor_ap_present &&
+	    !policy_mgr_is_hw_dbs_2x2_capable(mac_ctx->psoc) &&
+	    ((mac_ctx->roam.configParam.is_force_1x1 ==
+	    FORCE_1X1_ENABLED_FOR_AS &&
+	    mac_ctx->mlme_cfg->gen.as_enabled) ||
+	    mac_ctx->roam.configParam.is_force_1x1 ==
+	    FORCE_1X1_ENABLED_FORCED)) {
+		session->vdev_nss = 1;
+		session->nss = 1;
+		session->nss_forced_1x1 = true;
+		pe_debug("For special ap, NSS: %d force 1x1 %d",
+			  session->nss,
+			  mac_ctx->roam.configParam.is_force_1x1);
+	}
+
+	if (WLAN_REG_IS_24GHZ_CH_FREQ(bss_desc->chan_freq) &&
+	    !mac_ctx->mlme_cfg->vht_caps.vht_cap_info.b24ghz_band &&
+	    session->dot11mode == MLME_DOT11_MODE_11AC) {
+		/* Need to disable VHT operation in 2.4 GHz band */
+		session->dot11mode = MLME_DOT11_MODE_11N;
+	}
+
+	lim_handle_iot_ap_no_common_he_rates(mac_ctx, session, ie_struct);
+	lim_update_he_caps_mcs(mac_ctx, session);
+
+	qdf_mem_free(ie_struct);
+}
+
 /**
  * __lim_process_sme_join_req() - process SME_JOIN_REQ message
  * @mac_ctx: Pointer to Global MAC structure
@@ -1690,6 +2017,7 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 		session->dot11mode = sme_join_req->dot11mode;
 		lim_join_req_update_ht_vht_caps(mac_ctx, session, bss_desc);
 
+		lim_check_oui_and_update_session(mac_ctx, session);
 		/* Copying of bssId is already done, while creating session */
 		sir_copy_mac_addr(session->self_mac_addr,
 				  sme_join_req->self_mac_addr);
@@ -1885,9 +2213,6 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 
 
 		session->supported_nss_1x1 = sme_join_req->supported_nss_1x1;
-		session->vdev_nss = sme_join_req->vdev_nss;
-		session->nss = sme_join_req->nss;
-		session->nss_forced_1x1 = sme_join_req->nss_forced_1x1;
 
 		mlm_join_req->bssDescription.length =
 			session->lim_join_req->bssDescription.length;
@@ -2138,9 +2463,7 @@ static void __lim_process_sme_reassoc_req(struct mac_context *mac_ctx,
 	}
 
 	session_entry->supported_nss_1x1 = reassoc_req->supported_nss_1x1;
-	session_entry->vdev_nss = reassoc_req->vdev_nss;
-	session_entry->nss = reassoc_req->nss;
-	session_entry->nss_forced_1x1 = reassoc_req->nss_forced_1x1;
+	lim_check_oui_and_update_session(mac_ctx, session_entry);
 
 	pe_debug("vhtCapability: %d su_beam_formee: %d su_tx_bformer %d",
 		session_entry->vhtCapability,

core/mac/src/pe/lim/lim_types.h

@@ -1082,28 +1082,7 @@ lim_post_mlm_message(struct mac_context *mac, uint32_t msgType,
 static inline uint16_t
 lim_get_ielen_from_bss_description(struct bss_description *pBssDescr)
 {
-	uint16_t ielen;
-
-	if (!pBssDescr)
-		return 0;
-
-	/*
-	 * Length of BSS desription is without length of
-	 * length itself and length of pointer
-	 * that holds ieFields
-	 *
-	 * <------------sizeof(struct bss_description)-------------------->
-	 * +--------+---------------------------------+---------------+
-	 * | length | other fields                    | pointer to IEs|
-	 * +--------+---------------------------------+---------------+
-	 *                                            ^
-	 *                                            ieFields
-	 */
-
-	ielen = (uint16_t)(pBssDescr->length + sizeof(pBssDescr->length) -
-			   GET_FIELD_OFFSET(struct bss_description, ieFields));
-
-	return ielen;
+	return wlan_get_ielen_from_bss_description(pBssDescr);
 } /*** end lim_get_ielen_from_bss_description() ***/
 
 /**

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

@@ -6264,4 +6264,247 @@ QDF_STATUS populate_dot11f_twt_extended_caps(struct mac_context *mac_ctx,
 }
 #endif
 
+#if defined(WLAN_SAE_SINGLE_PMK) && defined(WLAN_FEATURE_ROAM_OFFLOAD)
+/**
+ * wlan_fill_single_pmk_ap_cap_from_scan_entry() - WAP3_SPMK VSIE from scan
+ * entry
+ * @bss_desc: BSS Descriptor
+ * @scan_entry: scan entry
+ *
+ * Return: None
+ */
+static void
+wlan_fill_single_pmk_ap_cap_from_scan_entry(struct bss_description *bss_desc,
+					    struct scan_cache_entry *scan_entry)
+{
+	bss_desc->is_single_pmk = util_scan_entry_single_pmk(scan_entry);
+}
+
+#else
+static inline void
+wlan_fill_single_pmk_ap_cap_from_scan_entry(struct bss_description *bss_desc,
+					    struct scan_cache_entry *scan_entry)
+{
+}
+#endif
+
+QDF_STATUS wlan_parse_bss_description_ies(struct mac_context *mac_ctx,
+					  struct bss_description *bss_desc,
+					  tDot11fBeaconIEs *ie_struct)
+{
+	int ie_len = wlan_get_ielen_from_bss_description(bss_desc);
+
+	if (ie_len <= 0 || !ie_struct)
+		return QDF_STATUS_E_FAILURE;
+
+	if (DOT11F_FAILED(dot11f_unpack_beacon_i_es
+			  (mac_ctx, (uint8_t *)bss_desc->ieFields,
+			  ie_len, ie_struct, false)))
+		return QDF_STATUS_E_FAILURE;
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS
+wlan_get_parsed_bss_description_ies(struct mac_context *mac_ctx,
+				    struct bss_description *bss_desc,
+				    tDot11fBeaconIEs **ie_struct)
+{
+	QDF_STATUS status;
+
+	if (!bss_desc || !ie_struct)
+		return QDF_STATUS_E_INVAL;
+
+	*ie_struct = qdf_mem_malloc(sizeof(tDot11fBeaconIEs));
+	if (!*ie_struct)
+		return QDF_STATUS_E_NOMEM;
+
+	status = wlan_parse_bss_description_ies(mac_ctx, bss_desc,
+					        *ie_struct);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		qdf_mem_free(*ie_struct);
+		*ie_struct = NULL;
+	}
+
+	return status;
+}
+
+#ifdef FEATURE_WLAN_ESE
+static void wlan_fill_qbss_load_param(tDot11fBeaconIEs *bcn_ies,
+				      struct bss_description *bss_desc)
+{
+	if (!bcn_ies->QBSSLoad.present)
+		return;
+
+	bss_desc->QBSSLoad_present = true;
+	bss_desc->QBSSLoad_avail = bcn_ies->QBSSLoad.avail;
+}
+#else
+static void wlan_fill_qbss_load_param(tDot11fBeaconIEs *bcn_ies,
+				      struct bss_description *bss_desc)
+{
+}
+#endif
+
+#ifdef WLAN_FEATURE_FILS_SK
+static void wlan_update_bss_with_fils_data(struct mac_context *mac_ctx,
+					  struct scan_cache_entry *scan_entry,
+					  struct bss_description *bss_descr)
+{
+	int ret;
+	tDot11fIEfils_indication fils_indication = {0};
+	struct sir_fils_indication fils_ind;
+
+	if (!scan_entry->ie_list.fils_indication)
+		return;
+
+	ret = dot11f_unpack_ie_fils_indication(mac_ctx,
+				scan_entry->ie_list.fils_indication +
+				SIR_FILS_IND_ELEM_OFFSET,
+				*(scan_entry->ie_list.fils_indication + 1),
+				&fils_indication, false);
+	if (DOT11F_FAILED(ret)) {
+		pe_err("unpack failed ret: 0x%x", ret);
+		return;
+	}
+
+	update_fils_data(&fils_ind, &fils_indication);
+	if (fils_ind.realm_identifier.realm_cnt > SIR_MAX_REALM_COUNT)
+		fils_ind.realm_identifier.realm_cnt = SIR_MAX_REALM_COUNT;
+
+	bss_descr->fils_info_element.realm_cnt =
+		fils_ind.realm_identifier.realm_cnt;
+	qdf_mem_copy(bss_descr->fils_info_element.realm,
+			fils_ind.realm_identifier.realm,
+			bss_descr->fils_info_element.realm_cnt * SIR_REALM_LEN);
+	if (fils_ind.cache_identifier.is_present) {
+		bss_descr->fils_info_element.is_cache_id_present = true;
+		qdf_mem_copy(bss_descr->fils_info_element.cache_id,
+			fils_ind.cache_identifier.identifier, CACHE_ID_LEN);
+	}
+	if (fils_ind.is_fils_sk_auth_supported)
+		bss_descr->fils_info_element.is_fils_sk_supported = true;
+}
+#else
+static void wlan_update_bss_with_fils_data(struct mac_context *mac_ctx,
+					  struct scan_cache_entry *scan_entry,
+					  struct bss_description *bss_descr)
+{ }
+#endif
+
+QDF_STATUS
+wlan_fill_bss_desc_from_scan_entry(struct mac_context *mac_ctx,
+				   struct bss_description *bss_desc,
+				   struct scan_cache_entry *scan_entry)
+{
+	uint8_t *ie_ptr;
+	uint32_t ie_len;
+	tpSirMacMgmtHdr hdr;
+	tDot11fBeaconIEs *bcn_ies;
+	QDF_STATUS status;
+
+	hdr = (tpSirMacMgmtHdr)scan_entry->raw_frame.ptr;
+
+	ie_len = util_scan_entry_ie_len(scan_entry);
+	ie_ptr = util_scan_entry_ie_data(scan_entry);
+
+	bss_desc->length = (uint16_t) (offsetof(struct bss_description,
+			   ieFields[0]) - sizeof(bss_desc->length) + ie_len);
+
+	qdf_mem_copy(bss_desc->bssId, scan_entry->bssid.bytes,
+		     QDF_MAC_ADDR_SIZE);
+	bss_desc->scansystimensec = scan_entry->scan_entry_time;
+	qdf_mem_copy(bss_desc->timeStamp,
+		scan_entry->tsf_info.data, 8);
+
+	bss_desc->beaconInterval = scan_entry->bcn_int;
+	bss_desc->capabilityInfo = scan_entry->cap_info.value;
+
+	if (WLAN_REG_IS_5GHZ_CH_FREQ(scan_entry->channel.chan_freq) ||
+	    WLAN_REG_IS_6GHZ_CHAN_FREQ(scan_entry->channel.chan_freq))
+		bss_desc->nwType = eSIR_11A_NW_TYPE;
+	else if (scan_entry->phy_mode == WLAN_PHYMODE_11B)
+		bss_desc->nwType = eSIR_11B_NW_TYPE;
+	else
+		bss_desc->nwType = eSIR_11G_NW_TYPE;
+
+	bss_desc->rssi = scan_entry->rssi_raw;
+	bss_desc->rssi_raw = scan_entry->rssi_raw;
+
+	/* channel frequency what peer sent in beacon/probersp. */
+	bss_desc->chan_freq = scan_entry->channel.chan_freq;
+	bss_desc->received_time =
+		scan_entry->scan_entry_time;
+	bss_desc->startTSF[0] =
+		mac_ctx->rrm.rrmPEContext.startTSF[0];
+	bss_desc->startTSF[1] =
+		mac_ctx->rrm.rrmPEContext.startTSF[1];
+	bss_desc->parentTSF =
+		scan_entry->rrm_parent_tsf;
+	bss_desc->fProbeRsp = (scan_entry->frm_subtype ==
+			  MGMT_SUBTYPE_PROBE_RESP);
+	bss_desc->seq_ctrl = hdr->seqControl;
+	bss_desc->tsf_delta = scan_entry->tsf_delta;
+	bss_desc->adaptive_11r_ap = scan_entry->adaptive_11r_ap;
+
+	bss_desc->mbo_oce_enabled_ap =
+			util_scan_entry_mbo_oce(scan_entry) ? true : false;
+
+	wlan_fill_single_pmk_ap_cap_from_scan_entry(bss_desc, scan_entry);
+
+	qdf_mem_copy(&bss_desc->mbssid_info, &scan_entry->mbssid_info,
+		     sizeof(struct scan_mbssid_info));
+
+	qdf_mem_copy((uint8_t *) &bss_desc->ieFields, ie_ptr, ie_len);
+
+	status = wlan_get_parsed_bss_description_ies(mac_ctx, bss_desc,
+						     &bcn_ies);
+	if (QDF_IS_STATUS_ERROR(status))
+		return status;
+
+	if (bcn_ies->MobilityDomain.present) {
+		bss_desc->mdiePresent = true;
+		qdf_mem_copy((uint8_t *)&(bss_desc->mdie[0]),
+			     (uint8_t *)&(bcn_ies->MobilityDomain.MDID),
+			     sizeof(uint16_t));
+		bss_desc->mdie[2] =
+			((bcn_ies->MobilityDomain.overDSCap << 0) |
+			(bcn_ies->MobilityDomain.resourceReqCap << 1));
+	}
+
+	wlan_fill_qbss_load_param(bcn_ies, bss_desc);
+	wlan_update_bss_with_fils_data(mac_ctx, scan_entry, bss_desc);
+
+	qdf_mem_free(bcn_ies);
+
+	return QDF_STATUS_SUCCESS;
+}
+
+uint16_t
+wlan_get_ielen_from_bss_description(struct bss_description *bss_desc)
+{
+	uint16_t ielen;
+
+	if (!bss_desc)
+		return 0;
+
+	/*
+	 * Length of BSS desription is without length of
+	 * length itself and length of pointer
+	 * that holds ieFields
+	 *
+	 * <------------sizeof(struct bss_description)-------------------->
+	 * +--------+---------------------------------+---------------+
+	 * | length | other fields                    | pointer to IEs|
+	 * +--------+---------------------------------+---------------+
+	 *                                            ^
+	 *                                            ieFields
+	 */
+
+	ielen = (uint16_t)(bss_desc->length + sizeof(bss_desc->length) -
+			   GET_FIELD_OFFSET(struct bss_description, ieFields));
+
+	return ielen;
+}
+
 /* parser_api.c ends here. */

core/sme/inc/csr_internal.h

@@ -607,7 +607,6 @@ struct csr_roam_session {
 	bool supported_nss_1x1;
 	uint8_t vdev_nss;
 	uint8_t nss;
-	bool nss_forced_1x1;
 	bool disable_hi_rssi;
 	bool dhcp_done;
 	enum wlan_reason_code disconnect_reason;

core/sme/src/csr/csr_api_roam.c

@@ -127,42 +127,6 @@
  * received from firmware
  */
 #define ROAM_REASON_MASK 0x0F
-/**
- * csr_get_ielen_from_bss_description() - to get IE length
- *             from struct bss_description structure
- * @pBssDescr: pBssDescr
- *
- * This function is called in various places to get IE length
- * from struct bss_description structure
- *
- * @Return: total IE length
- */
-static inline uint16_t
-csr_get_ielen_from_bss_description(struct bss_description *pBssDescr)
-{
-	uint16_t ielen;
-
-	if (!pBssDescr)
-		return 0;
-
-	/*
-	 * Length of BSS desription is without length of
-	 * length itself and length of pointer
-	 * that holds ieFields
-	 *
-	 * <------------sizeof(struct bss_description)-------------------->
-	 * +--------+---------------------------------+---------------+
-	 * | length | other fields                    | pointer to IEs|
-	 * +--------+---------------------------------+---------------+
-	 *                                            ^
-	 *                                            ieFields
-	 */
-
-	ielen = (uint16_t)(pBssDescr->length + sizeof(pBssDescr->length) -
-			   GET_FIELD_OFFSET(struct bss_description, ieFields));
-
-	return ielen;
-}
 
 #ifdef WLAN_FEATURE_SAE
 /**
@@ -9119,10 +9083,8 @@ static void csr_roam_join_rsp_processor(struct mac_context *mac,
 #endif
 		}
 
-		if (pSmeJoinRsp->nss < session_ptr->nss) {
-			session_ptr->nss = pSmeJoinRsp->nss;
-			session_ptr->vdev_nss = pSmeJoinRsp->nss;
-		}
+		session_ptr->nss = pSmeJoinRsp->nss;
+		session_ptr->vdev_nss = pSmeJoinRsp->nss;
 
 		session_ptr->supported_nss_1x1 = pSmeJoinRsp->supported_nss_1x1;
 
@@ -9587,10 +9549,8 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(struct mac_context *mac
 		result = eCsrReassocSuccess;
 		csr_session = CSR_GET_SESSION(mac, pSmeJoinRsp->vdev_id);
 		if (csr_session) {
-			if (pSmeJoinRsp->nss < csr_session->nss) {
-				csr_session->nss = pSmeJoinRsp->nss;
-				csr_session->vdev_nss = pSmeJoinRsp->nss;
-			}
+			csr_session->nss = pSmeJoinRsp->nss;
+			csr_session->vdev_nss = pSmeJoinRsp->nss;
 			csr_session->supported_nss_1x1 =
 				pSmeJoinRsp->supported_nss_1x1;
 			sme_debug("SME session supported nss: %d",
@@ -11972,7 +11932,7 @@ csr_roam_chk_lnk_swt_ch_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 	if (session->pConnectBssDesc) {
 		session->pConnectBssDesc->chan_freq = pSwitchChnInd->freq;
 
-		ie_len = csr_get_ielen_from_bss_description(
+		ie_len = wlan_get_ielen_from_bss_description(
 						session->pConnectBssDesc);
 		ds_params_ie = (tSirMacDsParamSetIE *)wlan_get_ie_ptr_from_eid(
 				DOT11F_EID_DSPARAMS,
@@ -14626,88 +14586,6 @@ static inline void csr_update_sae_config(struct join_req *csr_join_req,
 { }
 #endif
 
-/**
- * csr_get_nss_supported_by_sta_and_ap() - finds out nss from session
- * and beacon from AP
- * @vht_caps: VHT capabilities
- * @ht_caps: HT capabilities
- * @dot11_mode: dot11 mode
- *
- * Return: number of nss advertised by beacon
- */
-static uint8_t csr_get_nss_supported_by_sta_and_ap(tDot11fIEVHTCaps *vht_caps,
-						   tDot11fIEHTCaps *ht_caps,
-						   tDot11fIEhe_cap *he_cap,
-						   uint32_t dot11_mode)
-{
-	bool vht_capability, ht_capability, he_capability;
-
-	vht_capability = IS_DOT11_MODE_VHT(dot11_mode);
-	ht_capability = IS_DOT11_MODE_HT(dot11_mode);
-	he_capability = IS_DOT11_MODE_HE(dot11_mode);
-
-	if (he_capability && he_cap->present) {
-		if ((he_cap->rx_he_mcs_map_lt_80 & 0xC0) != 0xC0)
-			return NSS_4x4_MODE;
-
-		if ((he_cap->rx_he_mcs_map_lt_80 & 0x30) != 0x30)
-			return NSS_3x3_MODE;
-
-		if ((he_cap->rx_he_mcs_map_lt_80 & 0x0C) != 0x0C)
-			return NSS_2x2_MODE;
-	} else if (vht_capability && vht_caps->present) {
-		if ((vht_caps->rxMCSMap & 0xC0) != 0xC0)
-			return NSS_4x4_MODE;
-
-		if ((vht_caps->rxMCSMap & 0x30) != 0x30)
-			return NSS_3x3_MODE;
-
-		if ((vht_caps->rxMCSMap & 0x0C) != 0x0C)
-			return NSS_2x2_MODE;
-	} else if (ht_capability && ht_caps->present) {
-		if (ht_caps->supportedMCSSet[3])
-			return NSS_4x4_MODE;
-
-		if (ht_caps->supportedMCSSet[2])
-			return NSS_3x3_MODE;
-
-		if (ht_caps->supportedMCSSet[1])
-			return NSS_2x2_MODE;
-	}
-
-	return NSS_1x1_MODE;
-}
-
-/**
- * csr_check_vendor_ap_3_present() - Check if Vendor AP 3 is present
- * @mac_ctx: Pointer to Global MAC structure
- * @ie: Pointer to starting IE in Beacon/Probe Response
- * @ie_len: Length of all IEs combined
- *
- * For Vendor AP 3, the condition is that Vendor AP 3 IE should be present
- * and Vendor AP 4 IE should not be present.
- * If Vendor AP 3 IE is present and Vendor AP 4 IE is also present,
- * return false, else return true.
- *
- * Return: true or false
- */
-static bool
-csr_check_vendor_ap_3_present(struct mac_context *mac_ctx, uint8_t *ie,
-			      uint16_t ie_len)
-{
-	bool ret = true;
-
-	if ((wlan_get_vendor_ie_ptr_from_oui(SIR_MAC_VENDOR_AP_3_OUI,
-	    SIR_MAC_VENDOR_AP_3_OUI_LEN, ie, ie_len)) &&
-	    (wlan_get_vendor_ie_ptr_from_oui(SIR_MAC_VENDOR_AP_4_OUI,
-	    SIR_MAC_VENDOR_AP_4_OUI_LEN, ie, ie_len))) {
-		sme_debug("Vendor OUI 3 and Vendor OUI 4 found");
-		ret = false;
-	}
-
-	return ret;
-}
-
 /**
  * csr_enable_twt() - Check if its allowed to enable twt for this session
  * @ie: pointer to beacon/probe resp ie's
@@ -14731,54 +14609,6 @@ static bool csr_enable_twt(struct mac_context *mac_ctx, tDot11fBeaconIEs *ie)
 	return false;
 }
 
-#ifdef WLAN_FEATURE_11AX
-static void
-csr_update_he_caps_mcs(struct mac_context *mac
-,		       struct wlan_mlme_cfg *mlme_cfg,
-		       struct csr_roam_session *csr_session)
-{
-	uint32_t tx_mcs_map = 0;
-	uint32_t rx_mcs_map = 0;
-	uint32_t mcs_map = 0;
-	struct wlan_objmgr_vdev *vdev;
-	struct mlme_legacy_priv *mlme_priv;
-
-	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(mac->psoc,
-						    csr_session->vdev_id,
-						    WLAN_LEGACY_SME_ID);
-	if (!vdev)
-		return;
-	mlme_priv = wlan_vdev_mlme_get_ext_hdl(vdev);
-	if (!mlme_priv) {
-		wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID);
-		return;
-	}
-	rx_mcs_map = mlme_cfg->he_caps.dot11_he_cap.rx_he_mcs_map_lt_80;
-	tx_mcs_map = mlme_cfg->he_caps.dot11_he_cap.tx_he_mcs_map_lt_80;
-	mcs_map = rx_mcs_map & 0x3;
-
-	if (csr_session->nss == 1) {
-		tx_mcs_map = HE_SET_MCS_4_NSS(tx_mcs_map, HE_MCS_DISABLE, 2);
-		rx_mcs_map = HE_SET_MCS_4_NSS(rx_mcs_map, HE_MCS_DISABLE, 2);
-	} else {
-		tx_mcs_map = HE_SET_MCS_4_NSS(tx_mcs_map, mcs_map, 2);
-		rx_mcs_map = HE_SET_MCS_4_NSS(rx_mcs_map, mcs_map, 2);
-	}
-	sme_debug("new HE Nss MCS MAP: Rx 0x%0X, Tx: 0x%0X",
-		  rx_mcs_map, tx_mcs_map);
-	mlme_priv->he_config.tx_he_mcs_map_lt_80 = tx_mcs_map;
-	mlme_priv->he_config.rx_he_mcs_map_lt_80 = rx_mcs_map;
-	wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID);
-}
-#else
-static void
-csr_update_he_caps_mcs(struct mac_context *mac,
-		       struct wlan_mlme_cfg *mlme_cfg,
-		       struct csr_roam_session *csr_session)
-{
-}
-#endif
-
 #ifdef WLAN_ADAPTIVE_11R
 /**
  * csr_get_adaptive_11r_enabled() - Function to check if adaptive 11r
@@ -14819,54 +14649,6 @@ static QDF_STATUS csr_check_and_validate_6g_ap(struct mac_context *mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
-#ifdef WLAN_FEATURE_11AX
-static void csr_handle_iot_ap_no_common_he_rates(struct mac_context *mac,
-					struct csr_roam_session *session,
-					tDot11fBeaconIEs *ies,
-					uint32_t *dot11mode)
-{
-	uint16_t int_mcs;
-	struct wlan_objmgr_vdev *vdev;
-	struct mlme_legacy_priv *mlme_priv;
-
-	/* if the connection is not 11AX mode then return */
-	if (*dot11mode != MLME_DOT11_MODE_11AX)
-		return;
-
-	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(mac->psoc,
-						    session->vdev_id,
-						    WLAN_LEGACY_SME_ID);
-	if (!vdev)
-		return;
-	mlme_priv = wlan_vdev_mlme_get_ext_hdl(vdev);
-	if (!mlme_priv) {
-		wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID);
-		return;
-	}
-	int_mcs = HE_INTERSECT_MCS(mlme_priv->he_config.tx_he_mcs_map_lt_80,
-				   ies->he_cap.rx_he_mcs_map_lt_80);
-	sme_debug("HE self rates %x AP rates %x int_mcs %x vendorIE %d",
-		  mlme_priv->he_config.rx_he_mcs_map_lt_80,
-		  ies->he_cap.rx_he_mcs_map_lt_80, int_mcs,
-		  ies->vendor_vht_ie.present);
-	if (ies->he_cap.present)
-		if ((int_mcs == 0xFFFF) &&
-		    (ies->vendor_vht_ie.present ||
-		     ies->VHTCaps.present)) {
-			*dot11mode = MLME_DOT11_MODE_11AC;
-			sme_debug("No common 11AX rate. Force 11AC connection");
-	}
-	wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID);
-}
-#else
-static void csr_handle_iot_ap_no_common_he_rates(struct mac_context *mac,
-					struct csr_roam_session *session,
-					tDot11fBeaconIEs *ies,
-					uint32_t *dot11mode)
-{
-}
-#endif
-
 #if defined(WLAN_SAE_SINGLE_PMK) && defined(WLAN_FEATURE_ROAM_OFFLOAD)
 /**
  * csr_update_sae_single_pmk_ap_cap() - Function to update sae single pmk ap ie
@@ -14941,15 +14723,7 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 	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;
-	bool is_vendor_ap_present;
-	struct vdev_type_nss *vdev_type_nss;
-	struct action_oui_search_attr vendor_ap_search_attr;
 	enum csr_akm_type akm;
-	bool force_max_nss;
-	uint8_t ap_nss;
-	struct wlan_objmgr_vdev *vdev;
-	bool follow_ap_edca;
-	bool reconn_after_assoc_timeout = false;
 #ifdef FEATURE_WLAN_ESE
 	bool ese_config = false;
 #endif
@@ -15061,173 +14835,7 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 		csr_update_sae_single_pmk_ap_cap(mac, pBssDescription,
 						 sessionId, akm);
 
-		if (bss_freq <= 2484 &&
-		    !mac->mlme_cfg->vht_caps.vht_cap_info.b24ghz_band &&
-		    dot11mode == MLME_DOT11_MODE_11AC) {
-			/* Need to disable VHT operation in 2.4 GHz band */
-			dot11mode = MLME_DOT11_MODE_11N;
-		}
-		/*
-		 * FIX IOT AP:
-		 * AP capable of HE but doesn't advertize MCS rates for 1x1/2x2.
-		 * In such scenario, associate to AP in VHT mode
-		 */
-		csr_handle_iot_ap_no_common_he_rates(mac, pSession, pIes,
-						     &dot11mode);
-
-		ieLen = csr_get_ielen_from_bss_description(pBssDescription);
-
-		/* Fill the Vendor AP search params */
-		vendor_ap_search_attr.ie_data =
-				(uint8_t *)&pBssDescription->ieFields[0];
-		vendor_ap_search_attr.ie_length = ieLen;
-		vendor_ap_search_attr.mac_addr = &pBssDescription->bssId[0];
-		vendor_ap_search_attr.nss = csr_get_nss_supported_by_sta_and_ap(
-						&pIes->VHTCaps, &pIes->HTCaps,
-						&pIes->he_cap, dot11mode);
-		vendor_ap_search_attr.ht_cap = pIes->HTCaps.present;
-		vendor_ap_search_attr.vht_cap = pIes->VHTCaps.present;
-		vendor_ap_search_attr.enable_2g =
-					wlan_reg_is_24ghz_ch_freq(bss_freq);
-		vendor_ap_search_attr.enable_5g =
-					wlan_reg_is_5ghz_ch_freq(bss_freq);
-
-		if (wlan_reg_is_5ghz_ch_freq(bss_freq))
-			vdev_type_nss = &mac->vdev_type_nss_5g;
-		else
-			vdev_type_nss = &mac->vdev_type_nss_2g;
-		if (pSession->pCurRoamProfile->csrPersona ==
-		    QDF_P2P_CLIENT_MODE)
-			pSession->vdev_nss = vdev_type_nss->p2p_cli;
-		else
-			pSession->vdev_nss = vdev_type_nss->sta;
-		pSession->nss = pSession->vdev_nss;
-
-		force_max_nss = ucfg_action_oui_search(mac->psoc,
-						&vendor_ap_search_attr,
-						ACTION_OUI_FORCE_MAX_NSS);
-
-		if (!mac->mlme_cfg->vht_caps.vht_cap_info.enable2x2) {
-			force_max_nss = false;
-			pSession->nss = 1;
-		}
-
-		if (!force_max_nss)
-			ap_nss = csr_get_nss_supported_by_sta_and_ap(
-						&pIes->VHTCaps,
-						&pIes->HTCaps,
-						&pIes->he_cap,
-						dot11mode);
-		if (!force_max_nss && pSession->nss > ap_nss) {
-			pSession->nss = ap_nss;
-			pSession->vdev_nss = pSession->nss;
-		}
-
-		if (pSession->nss == 1)
-			pSession->supported_nss_1x1 = true;
-
-		follow_ap_edca = ucfg_action_oui_search(mac->psoc,
-					    &vendor_ap_search_attr,
-					    ACTION_OUI_DISABLE_AGGRESSIVE_EDCA);
-
-		if (messageType == eWNI_SME_JOIN_REQ &&
-		    ucfg_action_oui_search(mac->psoc, &vendor_ap_search_attr,
-					   ACTION_OUI_HOST_RECONN))
-			reconn_after_assoc_timeout = true;
-		mlme_set_reconn_after_assoc_timeout_flag(
-				mac->psoc, sessionId,
-				reconn_after_assoc_timeout);
-
-		vdev = wlan_objmgr_get_vdev_by_id_from_psoc(mac->psoc,
-							sessionId,
-							WLAN_LEGACY_MAC_ID);
-		if (vdev) {
-			mlme_set_follow_ap_edca_flag(vdev, follow_ap_edca);
-			wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_MAC_ID);
-		}
-
-		is_vendor_ap_present =
-				ucfg_action_oui_search(mac->psoc,
-						       &vendor_ap_search_attr,
-						       ACTION_OUI_CONNECT_1X1);
-
-		if (is_vendor_ap_present) {
-			is_vendor_ap_present = csr_check_vendor_ap_3_present(
-						mac,
-						vendor_ap_search_attr.ie_data,
-						ieLen);
-		}
-
-		/*
-		 * For WMI_ACTION_OUI_CONNECT_1x1_WITH_1_CHAIN, the host
-		 * sends the NSS as 1 to the FW and the FW then decides
-		 * after receiving the first beacon after connection to
-		 * switch to 1 Tx/Rx Chain.
-		 */
-
-		if (!is_vendor_ap_present) {
-			is_vendor_ap_present =
-				ucfg_action_oui_search(mac->psoc,
-					&vendor_ap_search_attr,
-					ACTION_OUI_CONNECT_1X1_WITH_1_CHAIN);
-			if (is_vendor_ap_present)
-				sme_debug("1x1 with 1 Chain AP");
-		}
-
-		if (is_vendor_ap_present &&
-		    !policy_mgr_is_hw_dbs_2x2_capable(mac->psoc) &&
-		    ((mac->roam.configParam.is_force_1x1 ==
-		    FORCE_1X1_ENABLED_FOR_AS &&
-		    mac->mlme_cfg->gen.as_enabled) ||
-		    mac->roam.configParam.is_force_1x1 ==
-		    FORCE_1X1_ENABLED_FORCED)) {
-			pSession->supported_nss_1x1 = true;
-			pSession->vdev_nss = 1;
-			pSession->nss = 1;
-			pSession->nss_forced_1x1 = true;
-			sme_debug("For special ap, NSS: %d force 1x1 %d",
-				  pSession->nss,
-				  mac->roam.configParam.is_force_1x1);
-		}
-
-		csr_update_he_caps_mcs(mac, mac->mlme_cfg, pSession);
-		/*
-		 * If CCK WAR is set for current AP, update to firmware via
-		 * WMI_VDEV_PARAM_ABG_MODE_TX_CHAIN_NUM
-		 */
-		is_vendor_ap_present =
-				ucfg_action_oui_search(mac->psoc,
-						       &vendor_ap_search_attr,
-						       ACTION_OUI_CCKM_1X1);
-		if (is_vendor_ap_present) {
-			sme_debug("vdev: %d WMI_VDEV_PARAM_ABG_MODE_TX_CHAIN_NUM 1",
-				 pSession->sessionId);
-			wma_cli_set_command(
-				pSession->sessionId,
-				(int)WMI_VDEV_PARAM_ABG_MODE_TX_CHAIN_NUM, 1,
-				VDEV_CMD);
-		}
-
-		/*
-		 * If Switch to 11N WAR is set for current AP, change dot11
-		 * mode to 11N.
-		 */
-		is_vendor_ap_present =
-			ucfg_action_oui_search(mac->psoc,
-					       &vendor_ap_search_attr,
-					       ACTION_OUI_SWITCH_TO_11N_MODE);
-		if (mac->roam.configParam.is_force_1x1 &&
-		    mac->mlme_cfg->gen.as_enabled &&
-		    is_vendor_ap_present &&
-		    (dot11mode == MLME_DOT11_MODE_ALL ||
-		     dot11mode == MLME_DOT11_MODE_11AC ||
-		     dot11mode == MLME_DOT11_MODE_11AC_ONLY))
-			dot11mode = MLME_DOT11_MODE_11N;
-
 		csr_join_req->supported_nss_1x1 = pSession->supported_nss_1x1;
-		csr_join_req->vdev_nss = pSession->vdev_nss;
-		csr_join_req->nss = pSession->nss;
-		csr_join_req->nss_forced_1x1 = pSession->nss_forced_1x1;
 		csr_join_req->dot11mode = (uint8_t)dot11mode;
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 		csr_join_req->cc_switch_mode =
@@ -20572,7 +20180,7 @@ static bool csr_is_sae_single_pmk_vsie_ap(struct bss_description *bss_des)
 		sme_debug("Invalid bss description");
 		return false;
 	}
-	ie_len = csr_get_ielen_from_bss_description(bss_des);
+	ie_len = wlan_get_ielen_from_bss_description(bss_des);
 
 	vendor_ie =
 		wlan_get_vendor_ie_ptr_from_oui(CSR_SINGLE_PMK_OUI,

core/sme/src/csr/csr_api_scan.c

@@ -2090,82 +2090,6 @@ static void csr_fill_neg_crypto_info(struct tag_csrscan_result *bss,
 		  bss->authType, bss->ucEncryptionType, bss->mcEncryptionType);
 }
 
-#ifdef WLAN_FEATURE_FILS_SK
-/**
- * csr_update_bss_with_fils_data: Fill FILS params in bss desc from scan entry
- * @mac_ctx: mac context
- * @scan_entry: scan entry
- * @bss_descr: bss description
- */
-static void csr_update_bss_with_fils_data(struct mac_context *mac_ctx,
-					  struct scan_cache_entry *scan_entry,
-					  struct bss_description *bss_descr)
-{
-	int ret;
-	tDot11fIEfils_indication fils_indication = {0};
-	struct sir_fils_indication fils_ind;
-
-	if (!scan_entry->ie_list.fils_indication)
-		return;
-
-	ret = dot11f_unpack_ie_fils_indication(mac_ctx,
-				scan_entry->ie_list.fils_indication +
-				SIR_FILS_IND_ELEM_OFFSET,
-				*(scan_entry->ie_list.fils_indication + 1),
-				&fils_indication, false);
-	if (DOT11F_FAILED(ret)) {
-		sme_err("unpack failed ret: 0x%x", ret);
-		return;
-	}
-
-	update_fils_data(&fils_ind, &fils_indication);
-	if (fils_ind.realm_identifier.realm_cnt > SIR_MAX_REALM_COUNT)
-		fils_ind.realm_identifier.realm_cnt = SIR_MAX_REALM_COUNT;
-
-	bss_descr->fils_info_element.realm_cnt =
-		fils_ind.realm_identifier.realm_cnt;
-	qdf_mem_copy(bss_descr->fils_info_element.realm,
-			fils_ind.realm_identifier.realm,
-			bss_descr->fils_info_element.realm_cnt * SIR_REALM_LEN);
-	if (fils_ind.cache_identifier.is_present) {
-		bss_descr->fils_info_element.is_cache_id_present = true;
-		qdf_mem_copy(bss_descr->fils_info_element.cache_id,
-			fils_ind.cache_identifier.identifier, CACHE_ID_LEN);
-	}
-	if (fils_ind.is_fils_sk_auth_supported)
-		bss_descr->fils_info_element.is_fils_sk_supported = true;
-}
-#else
-static void csr_update_bss_with_fils_data(struct mac_context *mac_ctx,
-					  struct scan_cache_entry *scan_entry,
-					  struct bss_description *bss_descr)
-{ }
-#endif
-
-#if defined(WLAN_SAE_SINGLE_PMK) && defined(WLAN_FEATURE_ROAM_OFFLOAD)
-/**
- * csr_fill_single_pmk_ap_cap_from_scan_entry() - WAP3_SPMK VSIE from scan
- * entry
- * @bss_desc: BSS Descriptor
- * @scan_entry: scan entry
- *
- * Return: None
- */
-static void
-csr_fill_single_pmk_ap_cap_from_scan_entry(struct bss_description *bss_desc,
-					   struct scan_cache_entry *scan_entry)
-{
-	bss_desc->is_single_pmk = util_scan_entry_single_pmk(scan_entry);
-}
-
-#else
-static inline void
-csr_fill_single_pmk_ap_cap_from_scan_entry(struct bss_description *bss_desc,
-					   struct scan_cache_entry *scan_entry)
-{
-}
-#endif
-
 static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx,
 					struct scan_cache_entry *scan_entry,
 					struct tag_csrscan_result **p_result)
@@ -2173,7 +2097,6 @@ static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx,
 	tDot11fBeaconIEs *bcn_ies;
 	struct bss_description *bss_desc;
 	tCsrScanResultInfo *result_info;
-	tpSirMacMgmtHdr hdr;
 	uint8_t *ie_ptr;
 	struct tag_csrscan_result *bss;
 	uint32_t bss_len, alloc_len, ie_len;
@@ -2195,8 +2118,6 @@ static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx,
 	ie_len = util_scan_entry_ie_len(scan_entry);
 	ie_ptr = util_scan_entry_ie_data(scan_entry);
 
-	hdr = (tpSirMacMgmtHdr)scan_entry->raw_frame.ptr;
-
 	bss_len = (uint16_t)(offsetof(struct bss_description,
 			   ieFields[0]) + ie_len);
 	alloc_len = sizeof(struct tag_csrscan_result) + bss_len;
@@ -2216,83 +2137,16 @@ static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx,
 
 	bss_desc = &result_info->BssDescriptor;
 
-	bss_desc->length = (uint16_t) (offsetof(struct bss_description,
-			   ieFields[0]) - sizeof(bss_desc->length) + ie_len);
-
-	qdf_mem_copy(bss_desc->bssId,
-			scan_entry->bssid.bytes,
-			QDF_MAC_ADDR_SIZE);
-	bss_desc->scansystimensec = scan_entry->scan_entry_time;
-	qdf_mem_copy(bss_desc->timeStamp,
-		scan_entry->tsf_info.data, 8);
-
-	bss_desc->beaconInterval = scan_entry->bcn_int;
-	bss_desc->capabilityInfo = scan_entry->cap_info.value;
+	wlan_fill_bss_desc_from_scan_entry(mac_ctx, bss_desc, scan_entry);
 
-	if (WLAN_REG_IS_5GHZ_CH_FREQ(scan_entry->channel.chan_freq) ||
-	    WLAN_REG_IS_6GHZ_CHAN_FREQ(scan_entry->channel.chan_freq))
-		bss_desc->nwType = eSIR_11A_NW_TYPE;
-	else if (scan_entry->phy_mode == WLAN_PHYMODE_11B)
-		bss_desc->nwType = eSIR_11B_NW_TYPE;
-	else
-		bss_desc->nwType = eSIR_11G_NW_TYPE;
-
-	bss_desc->rssi = scan_entry->rssi_raw;
-	bss_desc->rssi_raw = scan_entry->rssi_raw;
-
-	/* channel frequency what peer sent in beacon/probersp. */
-	bss_desc->chan_freq = scan_entry->channel.chan_freq;
-	bss_desc->received_time =
-		scan_entry->scan_entry_time;
-	bss_desc->startTSF[0] =
-		mac_ctx->rrm.rrmPEContext.startTSF[0];
-	bss_desc->startTSF[1] =
-		mac_ctx->rrm.rrmPEContext.startTSF[1];
-	bss_desc->parentTSF =
-		scan_entry->rrm_parent_tsf;
-	bss_desc->fProbeRsp = (scan_entry->frm_subtype ==
-			  MGMT_SUBTYPE_PROBE_RESP);
-	bss_desc->seq_ctrl = hdr->seqControl;
-	bss_desc->tsf_delta = scan_entry->tsf_delta;
-	bss_desc->adaptive_11r_ap = scan_entry->adaptive_11r_ap;
-
-	bss_desc->mbo_oce_enabled_ap =
-			util_scan_entry_mbo_oce(scan_entry) ? true : false;
-
-	csr_fill_single_pmk_ap_cap_from_scan_entry(bss_desc, scan_entry);
-
-	qdf_mem_copy(&bss_desc->mbssid_info, &scan_entry->mbssid_info,
-		     sizeof(struct scan_mbssid_info));
-
-	qdf_mem_copy((uint8_t *) &bss_desc->ieFields,
-		ie_ptr, ie_len);
-
-	status = csr_get_parsed_bss_description_ies(mac_ctx,
-			  bss_desc, &bcn_ies);
+	status = wlan_get_parsed_bss_description_ies(mac_ctx, bss_desc,
+						     &bcn_ies);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		qdf_mem_free(bss);
 		return status;
 	}
 	result_info->pvIes = bcn_ies;
 
-	if (bcn_ies->MobilityDomain.present) {
-		bss_desc->mdiePresent = true;
-		qdf_mem_copy((uint8_t *)&(bss_desc->mdie[0]),
-			     (uint8_t *)&(bcn_ies->MobilityDomain.MDID),
-			     sizeof(uint16_t));
-		bss_desc->mdie[2] =
-			((bcn_ies->MobilityDomain.overDSCap << 0) |
-			(bcn_ies->MobilityDomain.resourceReqCap << 1));
-	}
-#ifdef FEATURE_WLAN_ESE
-	if (bcn_ies->QBSSLoad.present) {
-		bss_desc->QBSSLoad_present = true;
-		bss_desc->QBSSLoad_avail =
-			bcn_ies->QBSSLoad.avail;
-	}
-#endif
-	csr_update_bss_with_fils_data(mac_ctx, scan_entry, bss_desc);
-
 	*p_result = bss;
 	return QDF_STATUS_SUCCESS;
 }

core/sme/src/csr/csr_util.c

@@ -1413,19 +1413,7 @@ QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx,
 					 struct bss_description *bss_desc,
 					 tDot11fBeaconIEs *pIEStruct)
 {
-	QDF_STATUS status = QDF_STATUS_E_FAILURE;
-	int ieLen =
-		(int)(bss_desc->length + sizeof(bss_desc->length) -
-		      GET_FIELD_OFFSET(struct bss_description, ieFields));
-
-	if (ieLen > 0 && pIEStruct) {
-		if (!DOT11F_FAILED(dot11f_unpack_beacon_i_es
-				    (mac_ctx, (uint8_t *)bss_desc->ieFields,
-				    ieLen, pIEStruct, false)))
-		status = QDF_STATUS_SUCCESS;
-	}
-
-	return status;
+	return wlan_parse_bss_description_ies(mac_ctx, bss_desc, pIEStruct);
 }
 
 /* This function will allocate memory for the parsed IEs to the caller.
@@ -1436,26 +1424,8 @@ QDF_STATUS csr_get_parsed_bss_description_ies(struct mac_context *mac_ctx,
 					      struct bss_description *bss_desc,
 					      tDot11fBeaconIEs **ppIEStruct)
 {
-	QDF_STATUS status = QDF_STATUS_E_INVAL;
-
-	if (bss_desc && ppIEStruct) {
-		*ppIEStruct = qdf_mem_malloc(sizeof(tDot11fBeaconIEs));
-		if ((*ppIEStruct) != NULL) {
-			status = csr_parse_bss_description_ies(mac_ctx,
-							       bss_desc,
-							       *ppIEStruct);
-			if (!QDF_IS_STATUS_SUCCESS(status)) {
-				qdf_mem_free(*ppIEStruct);
-				*ppIEStruct = NULL;
-			}
-		} else {
-			sme_err("failed to allocate memory");
-			QDF_ASSERT(0);
-			return QDF_STATUS_E_NOMEM;
-		}
-	}
-
-	return status;
+	return wlan_get_parsed_bss_description_ies(mac_ctx, bss_desc,
+						   ppIEStruct);
 }
 
 bool csr_is_nullssid(uint8_t *pBssSsid, uint8_t len)