qcacld-3.0: Remove the ML IE sent in assoc request IE data

Remove the MLO IE sent in connect request association request
data to avoid duplication.

Change-Id: Icccf378c05cd9509dfbb42d68a9859c9a0bb315a
CRs-Fixed: 3259650

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

@@ -2681,8 +2681,10 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
 					    &frm->he_6ghz_band_cap);
 	}
 
-	if (lim_is_session_eht_capable(pe_session))
+	if (lim_is_session_eht_capable(pe_session)) {
 		populate_dot11f_eht_caps(mac_ctx, pe_session, &frm->eht_cap);
+		lim_strip_mlo_ie(mac_ctx, add_ie, &add_ie_len);
+	}
 
 	mlo_ie_len =
 		 lim_send_assoc_req_mgmt_frame_mlo(mac_ctx, pe_session, frm);

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

@@ -8051,6 +8051,40 @@ QDF_STATUS lim_send_mlo_caps_ie(struct mac_context *mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
+void lim_strip_mlo_ie(struct mac_context *mac_ctx,
+		      uint8_t *add_ie, uint16_t *add_ielen)
+{
+	uint8_t *mlo_ie_buff = NULL;
+	uint16_t mlo_ie_buff_len = 0;
+	QDF_STATUS qdf_status;
+
+	/* MLO ext ie in addition IE*/
+	if (wlan_get_ext_ie_ptr_from_ext_id(MLO_IE_OUI_TYPE, ONE_BYTE,
+					    add_ie, *add_ielen)) {
+		mlo_ie_buff = qdf_mem_malloc(WLAN_MAX_IE_LEN + 2);
+
+		if (!mlo_ie_buff) {
+			pe_err("Failed to allocate MLO IE buff");
+			return;
+		}
+
+		qdf_status = lim_strip_ie(mac_ctx, add_ie, add_ielen,
+					  WLAN_ELEMID_EXTN_ELEM, ONE_BYTE,
+					  MLO_IE_OUI_TYPE, MLO_IE_OUI_SIZE,
+					  mlo_ie_buff, WLAN_MAX_IE_LEN);
+		if (QDF_IS_STATUS_ERROR(qdf_status)) {
+			pe_err("Failed to strip MLO IE");
+			qdf_mem_free(mlo_ie_buff);
+			return;
+		}
+		mlo_ie_buff_len = mlo_ie_buff[1] + 2; /* 2 - EID+LEN */
+		pe_debug("remove supplicant mlo ie, %d bytes", mlo_ie_buff[1]);
+		qdf_trace_hex_dump(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
+				   mlo_ie_buff, mlo_ie_buff_len);
+
+		qdf_mem_free(mlo_ie_buff);
+	}
+}
 #endif
 
 #ifdef WLAN_FEATURE_11BE

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

@@ -287,6 +287,18 @@ QDF_STATUS lim_send_mlo_caps_ie(struct mac_context *mac_ctx,
 				struct pe_session *session,
 				enum QDF_OPMODE device_mode,
 				uint8_t vdev_id);
+
+/**
+ * lim_strip_mlo_ie() - Removes the MLO IE data from additional IE data
+ *
+ * @mac_ctx: global MAC context
+ * @add_ie: Additional IE buffer
+ * @add_ielen: Pointer to length of additional IE
+ *
+ * Return: Void
+ */
+void lim_strip_mlo_ie(struct mac_context *mac_ctx,
+		      uint8_t *add_ie, uint16_t *add_ielen);
 #else
 static inline uint16_t lim_assign_mlo_conn_idx(struct mac_context *mac,
 					       struct pe_session *pe_session,
@@ -313,6 +325,12 @@ void lim_set_mlo_caps(struct mac_context *mac, struct pe_session *session,
 {
 }
 
+static inline
+void lim_strip_mlo_ie(struct mac_context *mac_ctx,
+		      uint8_t *addn_ie, uint16_t *addn_ielen)
+{
+}
+
 static inline
 QDF_STATUS lim_send_mlo_caps_ie(struct mac_context *mac_ctx,
 				struct pe_session *session,