Browse Source

qcacld-3.0: Add op mode IE to non-inheritance list in MLO IE

Include the op mode IE for a 20 MHz connection if HE is not
supported. Add the op mode IE to the non-inheritance list of
the MLO IE if the IE is included in the assoc request frame.

Change-Id: Ib534ebcd5305862afa23e32d95049da03915db9f
CRs-Fixed: 3331916
Kiran Kumar Lokere 2 years ago
parent
commit
b8c9877eff

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

@@ -2705,7 +2705,8 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
 		vht_enabled = true;
 		if (pe_session->gLimOperatingMode.present &&
 		    pe_session->ch_width == CH_WIDTH_20MHZ &&
-		    frm->VHTCaps.present) {
+		    frm->VHTCaps.present &&
+		    !IS_DOT11_MODE_HE(pe_session->dot11mode)) {
 			populate_dot11f_operating_mode(mac_ctx,
 					&frm->OperatingMode, pe_session);
 		}

+ 5 - 0
core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -11506,6 +11506,11 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 		} else {
 			pe_debug("eht ie not included");
 		}
+		if (frm->OperatingMode.present) {
+			pe_info("opmode in assoc req, add to non inher list");
+			non_inher_ie_lists[non_inher_len++] =
+						DOT11F_EID_OPERATINGMODE;
+		}
 
 		populate_dot11f_non_inheritance(
 				mac_ctx, &sta_prof_non_inherit,