瀏覽代碼

qcacld-3.0: Do not reset STA connection caps in testbed mode

Do not limit the STA supported BW capabilities to BSS
supported BW during the connection if the STA is operating
in testbed mode.

Change-Id: Idad613b7ea28059ab3ca9f474b2b0923cb4d5405
CRs-Fixed: 3271416
Kiran Kumar Lokere 2 年之前
父節點
當前提交
60846e8aa3
共有 2 個文件被更改,包括 13 次插入1 次删除
  1. 2 1
      core/mac/src/pe/lim/lim_prop_exts_utils.c
  2. 11 0
      core/mac/src/pe/lim/lim_utils.c

+ 2 - 1
core/mac/src/pe/lim/lim_prop_exts_utils.c

@@ -816,7 +816,8 @@ void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
 	lim_check_peer_ldpc_and_update(session, beacon_struct);
 	lim_extract_he_op(session, beacon_struct);
 	lim_extract_eht_op(session, beacon_struct);
-	lim_update_he_bw_cap_mcs(session, beacon_struct);
+	if (!mac_ctx->usr_eht_testbed_cfg)
+		lim_update_he_bw_cap_mcs(session, beacon_struct);
 	lim_update_eht_bw_cap_mcs(session, beacon_struct);
 	/* Extract the UAPSD flag from WMM Parameter element */
 	if (beacon_struct->wmeEdcaPresent)

+ 11 - 0
core/mac/src/pe/lim/lim_utils.c

@@ -7261,6 +7261,17 @@ void lim_copy_join_req_he_cap(struct pe_session *session)
 		lim_revise_req_he_cap_per_band(mlme_priv, session);
 	qdf_mem_copy(&(session->he_config), &(mlme_priv->he_config),
 		     sizeof(session->he_config));
+	if (WLAN_REG_IS_24GHZ_CH_FREQ(session->curr_op_freq)) {
+		session->he_config.chan_width_1 = 0;
+		session->he_config.chan_width_2 = 0;
+		session->he_config.chan_width_3 = 0;
+		session->he_config.chan_width_5 = 0;
+		session->he_config.chan_width_6 = 0;
+	} else {
+		session->he_config.chan_width_0 = 0;
+		session->he_config.chan_width_4 = 0;
+		session->he_config.chan_width_6 = 0;
+	}
 }
 
 void lim_log_he_cap(struct mac_context *mac, tDot11fIEhe_cap *he_cap)