qcacld-3.0: Remove duplicate struct struct wlan_ies

Remove duplicate struct struct wlan_ies and replace with
struct element_info.

Change-Id: I60d34db5845d840679052912182ea09b86988e43
CRs-Fixed: 2848237

components/mlme/core/inc/wlan_mlme_main.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -59,8 +59,8 @@ struct wlan_mlme_psoc_ext_obj {
  * @from_ap: True if the disconnection is initiated from AP
  */
 struct wlan_disconnect_info {
-	struct wlan_ies self_discon_ies;
-	struct wlan_ies peer_discon_ies;
+	struct element_info self_discon_ies;
+	struct element_info peer_discon_ies;
 	uint32_t discon_reason;
 	bool from_ap;
 };
@@ -72,7 +72,7 @@ struct wlan_disconnect_info {
  */
 struct sae_auth_retry {
 	uint8_t sae_auth_max_retry;
-	struct wlan_ies sae_auth;
+	struct element_info sae_auth;
 };
 
 /**
@@ -456,7 +456,7 @@ void mlme_free_sae_auth_retry(struct wlan_objmgr_vdev *vdev);
  * Return: None
  */
 void mlme_set_self_disconnect_ies(struct wlan_objmgr_vdev *vdev,
-				  struct wlan_ies *ie);
+				  struct element_info *ie);
 
 /**
  * mlme_free_self_disconnect_ies() - Free the self diconnect IEs
@@ -472,7 +472,7 @@ void mlme_free_self_disconnect_ies(struct wlan_objmgr_vdev *vdev);
  *
  * Return: Returns a pointer to the self disconnect IEs present in vdev object
  */
-struct wlan_ies *mlme_get_self_disconnect_ies(struct wlan_objmgr_vdev *vdev);
+struct element_info *mlme_get_self_disconnect_ies(struct wlan_objmgr_vdev *vdev);
 
 /**
  * mlme_set_peer_disconnect_ies() - Cache disconnect IEs received from peer
@@ -482,7 +482,7 @@ struct wlan_ies *mlme_get_self_disconnect_ies(struct wlan_objmgr_vdev *vdev);
  * Return: None
  */
 void mlme_set_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev,
-				  struct wlan_ies *ie);
+				  struct element_info *ie);
 
 /**
  * mlme_free_peer_disconnect_ies() - Free the peer diconnect IEs
@@ -538,7 +538,7 @@ bool mlme_get_reconn_after_assoc_timeout_flag(struct wlan_objmgr_psoc *psoc,
  *
  * Return: Returns a pointer to the peer disconnect IEs present in vdev object
  */
-struct wlan_ies *mlme_get_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev);
+struct element_info *mlme_get_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev);
 
 /**
  * mlme_set_peer_pmf_status() - set pmf status of peer

components/mlme/core/src/wlan_mlme_main.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -2381,18 +2381,18 @@ void mlme_free_sae_auth_retry(struct wlan_objmgr_vdev *vdev)
 	}
 
 	mlme_priv->sae_retry.sae_auth_max_retry = 0;
-	if (mlme_priv->sae_retry.sae_auth.data)
-		qdf_mem_free(mlme_priv->sae_retry.sae_auth.data);
-	mlme_priv->sae_retry.sae_auth.data = NULL;
+	if (mlme_priv->sae_retry.sae_auth.ptr)
+		qdf_mem_free(mlme_priv->sae_retry.sae_auth.ptr);
+	mlme_priv->sae_retry.sae_auth.ptr = NULL;
 	mlme_priv->sae_retry.sae_auth.len = 0;
 }
 
 void mlme_set_self_disconnect_ies(struct wlan_objmgr_vdev *vdev,
-				  struct wlan_ies *ie)
+				  struct element_info *ie)
 {
 	struct mlme_legacy_priv *mlme_priv;
 
-	if (!ie || !ie->len || !ie->data) {
+	if (!ie || !ie->len || !ie->ptr) {
 		mlme_legacy_debug("disocnnect IEs are NULL");
 		return;
 	}
@@ -2403,23 +2403,23 @@ void mlme_set_self_disconnect_ies(struct wlan_objmgr_vdev *vdev,
 		return;
 	}
 
-	if (mlme_priv->disconnect_info.self_discon_ies.data) {
-		qdf_mem_free(mlme_priv->disconnect_info.self_discon_ies.data);
+	if (mlme_priv->disconnect_info.self_discon_ies.ptr) {
+		qdf_mem_free(mlme_priv->disconnect_info.self_discon_ies.ptr);
 		mlme_priv->disconnect_info.self_discon_ies.len = 0;
 	}
 
-	mlme_priv->disconnect_info.self_discon_ies.data =
+	mlme_priv->disconnect_info.self_discon_ies.ptr =
 				qdf_mem_malloc(ie->len);
-	if (!mlme_priv->disconnect_info.self_discon_ies.data)
+	if (!mlme_priv->disconnect_info.self_discon_ies.ptr)
 		return;
 
-	qdf_mem_copy(mlme_priv->disconnect_info.self_discon_ies.data,
-		     ie->data, ie->len);
+	qdf_mem_copy(mlme_priv->disconnect_info.self_discon_ies.ptr,
+		     ie->ptr, ie->len);
 	mlme_priv->disconnect_info.self_discon_ies.len = ie->len;
 
 	mlme_legacy_debug("Self disconnect IEs");
 	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_MLME, QDF_TRACE_LEVEL_DEBUG,
-			   mlme_priv->disconnect_info.self_discon_ies.data,
+			   mlme_priv->disconnect_info.self_discon_ies.ptr,
 			   mlme_priv->disconnect_info.self_discon_ies.len);
 }
 
@@ -2433,14 +2433,14 @@ void mlme_free_self_disconnect_ies(struct wlan_objmgr_vdev *vdev)
 		return;
 	}
 
-	if (mlme_priv->disconnect_info.self_discon_ies.data) {
-		qdf_mem_free(mlme_priv->disconnect_info.self_discon_ies.data);
-		mlme_priv->disconnect_info.self_discon_ies.data = NULL;
+	if (mlme_priv->disconnect_info.self_discon_ies.ptr) {
+		qdf_mem_free(mlme_priv->disconnect_info.self_discon_ies.ptr);
+		mlme_priv->disconnect_info.self_discon_ies.ptr = NULL;
 		mlme_priv->disconnect_info.self_discon_ies.len = 0;
 	}
 }
 
-struct wlan_ies *mlme_get_self_disconnect_ies(struct wlan_objmgr_vdev *vdev)
+struct element_info *mlme_get_self_disconnect_ies(struct wlan_objmgr_vdev *vdev)
 {
 	struct mlme_legacy_priv *mlme_priv;
 
@@ -2454,11 +2454,11 @@ struct wlan_ies *mlme_get_self_disconnect_ies(struct wlan_objmgr_vdev *vdev)
 }
 
 void mlme_set_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev,
-				  struct wlan_ies *ie)
+				  struct element_info *ie)
 {
 	struct mlme_legacy_priv *mlme_priv;
 
-	if (!ie || !ie->len || !ie->data) {
+	if (!ie || !ie->len || !ie->ptr) {
 		mlme_legacy_debug("disocnnect IEs are NULL");
 		return;
 	}
@@ -2469,23 +2469,23 @@ void mlme_set_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev,
 		return;
 	}
 
-	if (mlme_priv->disconnect_info.peer_discon_ies.data) {
-		qdf_mem_free(mlme_priv->disconnect_info.peer_discon_ies.data);
+	if (mlme_priv->disconnect_info.peer_discon_ies.ptr) {
+		qdf_mem_free(mlme_priv->disconnect_info.peer_discon_ies.ptr);
 		mlme_priv->disconnect_info.peer_discon_ies.len = 0;
 	}
 
-	mlme_priv->disconnect_info.peer_discon_ies.data =
+	mlme_priv->disconnect_info.peer_discon_ies.ptr =
 					qdf_mem_malloc(ie->len);
-	if (!mlme_priv->disconnect_info.peer_discon_ies.data)
+	if (!mlme_priv->disconnect_info.peer_discon_ies.ptr)
 		return;
 
-	qdf_mem_copy(mlme_priv->disconnect_info.peer_discon_ies.data,
-		     ie->data, ie->len);
+	qdf_mem_copy(mlme_priv->disconnect_info.peer_discon_ies.ptr,
+		     ie->ptr, ie->len);
 	mlme_priv->disconnect_info.peer_discon_ies.len = ie->len;
 
 	mlme_legacy_debug("peer disconnect IEs");
 	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_MLME, QDF_TRACE_LEVEL_DEBUG,
-			   mlme_priv->disconnect_info.peer_discon_ies.data,
+			   mlme_priv->disconnect_info.peer_discon_ies.ptr,
 			   mlme_priv->disconnect_info.peer_discon_ies.len);
 }
 
@@ -2499,14 +2499,14 @@ void mlme_free_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev)
 		return;
 	}
 
-	if (mlme_priv->disconnect_info.peer_discon_ies.data) {
-		qdf_mem_free(mlme_priv->disconnect_info.peer_discon_ies.data);
-		mlme_priv->disconnect_info.peer_discon_ies.data = NULL;
+	if (mlme_priv->disconnect_info.peer_discon_ies.ptr) {
+		qdf_mem_free(mlme_priv->disconnect_info.peer_discon_ies.ptr);
+		mlme_priv->disconnect_info.peer_discon_ies.ptr = NULL;
 		mlme_priv->disconnect_info.peer_discon_ies.len = 0;
 	}
 }
 
-struct wlan_ies *mlme_get_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev)
+struct element_info *mlme_get_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev)
 {
 	struct mlme_legacy_priv *mlme_priv;
 

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -2502,14 +2502,4 @@ struct mlme_roam_debug_info {
 	struct roam_initial_data roam_init_info;
 	struct roam_msg_info roam_msg_info;
 };
-
-/**
- * struct wlan_ies - Generic WLAN Information Element(s) format
- * @len: Total length of the IEs
- * @data: IE data
- */
-struct wlan_ies {
-	uint16_t len;
-	uint8_t *data;
-};
 #endif

components/umac/mlme/connection_mgr/core/src/wlan_cm_vdev_disconnect.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015, 2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015, 2020-2021, The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -176,14 +176,14 @@ QDF_STATUS cm_send_sb_disconnect_req(struct scheduler_msg *msg)
 static void cm_copy_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev,
 					struct element_info *ap_ie)
 {
-	struct wlan_ies *discon_ie;
+	struct element_info *discon_ie;
 
 	discon_ie = mlme_get_peer_disconnect_ies(vdev);
 	if (!discon_ie)
 		return;
 
 	ap_ie->len = discon_ie->len;
-	ap_ie->ptr = discon_ie->data;
+	ap_ie->ptr = discon_ie->ptr;
 }
 
 QDF_STATUS cm_handle_disconnect_resp(struct scheduler_msg *msg)

core/hdd/src/wlan_hdd_assoc.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1778,7 +1778,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	bool send_discon_ind = true;
 	mac_handle_t mac_handle = hdd_ctx->mac_handle;
-	struct wlan_ies disconnect_ies = {0};
+	struct element_info disconnect_ies = {0};
 	bool from_ap = false;
 	uint32_t reason_code = 0;
 	struct wlan_objmgr_vdev *vdev;
@@ -1831,8 +1831,8 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 		int reason = WLAN_REASON_UNSPECIFIED;
 
 		if (roam_info && roam_info->disconnect_ies) {
-			disconnect_ies.data =
-				roam_info->disconnect_ies->data;
+			disconnect_ies.ptr =
+				roam_info->disconnect_ies->ptr;
 			disconnect_ies.len =
 				roam_info->disconnect_ies->len;
 		}
@@ -1853,7 +1853,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 		wlan_hdd_cfg80211_indicate_disconnect(
 						adapter, !from_ap,
 						reason_code,
-						disconnect_ies.data,
+						disconnect_ies.ptr,
 						disconnect_ies.len);
 	}
 

core/hdd/src/wlan_hdd_hostapd.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1551,11 +1551,11 @@ static void hdd_fill_station_info(struct hdd_adapter *adapter,
 
 	/* Save assoc request IEs */
 	if (event->ies_len) {
-		qdf_mem_free(stainfo->assoc_req_ies.data);
+		qdf_mem_free(stainfo->assoc_req_ies.ptr);
 		stainfo->assoc_req_ies.len = 0;
-		stainfo->assoc_req_ies.data = qdf_mem_malloc(event->ies_len);
-		if (stainfo->assoc_req_ies.data) {
-			qdf_mem_copy(stainfo->assoc_req_ies.data, event->ies,
+		stainfo->assoc_req_ies.ptr = qdf_mem_malloc(event->ies_len);
+		if (stainfo->assoc_req_ies.ptr) {
+			qdf_mem_copy(stainfo->assoc_req_ies.ptr, event->ies,
 				     event->ies_len);
 			stainfo->assoc_req_ies.len = event->ies_len;
 		}
@@ -1573,10 +1573,10 @@ static void hdd_fill_station_info(struct hdd_adapter *adapter,
 
 		qdf_mem_copy(cache_sta_info, stainfo, sizeof(*cache_sta_info));
 		cache_sta_info->is_attached = 0;
-		cache_sta_info->assoc_req_ies.data =
+		cache_sta_info->assoc_req_ies.ptr =
 				qdf_mem_malloc(event->ies_len);
-		if (cache_sta_info->assoc_req_ies.data) {
-			qdf_mem_copy(cache_sta_info->assoc_req_ies.data,
+		if (cache_sta_info->assoc_req_ies.ptr) {
+			qdf_mem_copy(cache_sta_info->assoc_req_ies.ptr,
 				     event->ies, event->ies_len);
 			cache_sta_info->assoc_req_ies.len = event->ies_len;
 		}

core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -916,8 +916,8 @@ hdd_reset_sta_info_during_reattach(struct hdd_station_info *sta_info)
 	sta_info->rx_mc_bc_cnt = 0;
 
 	if (sta_info->assoc_req_ies.len) {
-		qdf_mem_free(sta_info->assoc_req_ies.data);
-		sta_info->assoc_req_ies.data = NULL;
+		qdf_mem_free(sta_info->assoc_req_ies.ptr);
+		sta_info->assoc_req_ies.ptr = NULL;
 		sta_info->assoc_req_ies.len = 0;
 	}
 

core/hdd/src/wlan_hdd_sta_info.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -253,8 +253,8 @@ hdd_put_sta_info_ref(struct hdd_sta_info_obj *sta_info_container,
 
 	qdf_copy_macaddr(&addr, &info->sta_mac);
 	if (info->assoc_req_ies.len) {
-		qdf_mem_free(info->assoc_req_ies.data);
-		info->assoc_req_ies.data = NULL;
+		qdf_mem_free(info->assoc_req_ies.ptr);
+		info->assoc_req_ies.ptr = NULL;
 		info->assoc_req_ies.len = 0;
 	}
 

core/hdd/src/wlan_hdd_sta_info.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -282,7 +282,7 @@ struct hdd_station_info {
 	uint32_t tx_retry_fw;
 	uint32_t tx_retry_exhaust_fw;
 	uint32_t rx_fcs_count;
-	struct wlan_ies assoc_req_ies;
+	struct element_info assoc_req_ies;
 	qdf_atomic_t ref_cnt;
 	qdf_atomic_t ref_cnt_dbgid[STA_INFO_ID_MAX];
 	unsigned long pending_eap_frm_type;

core/hdd/src/wlan_hdd_station_info.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1319,7 +1319,7 @@ static int hdd_get_cached_station_remote(struct hdd_context *hdd_ctx,
 
 	if (stainfo->assoc_req_ies.len) {
 		if (nla_put(skb, ASSOC_REQ_IES, stainfo->assoc_req_ies.len,
-			    stainfo->assoc_req_ies.data)) {
+			    stainfo->assoc_req_ies.ptr)) {
 			hdd_err("Failed to put assoc req IEs");
 			goto fail;
 		}

core/hdd/src/wlan_hdd_stats.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -4491,7 +4491,7 @@ static void wlan_hdd_fill_station_info(struct wlan_objmgr_psoc *psoc,
 	hdd_fill_rate_info(psoc, sinfo, stainfo, stats);
 
 	/* assoc req ies */
-	sinfo->assoc_req_ies = stainfo->assoc_req_ies.data;
+	sinfo->assoc_req_ies = stainfo->assoc_req_ies.ptr;
 	sinfo->assoc_req_ies_len = stainfo->assoc_req_ies.len;
 
 	/* dump sta info*/

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -4386,7 +4386,7 @@ void lim_extract_ies_from_deauth_disassoc(struct pe_session *session,
 					  uint16_t deauth_disassoc_frame_len)
 {
 	uint16_t reason_code, ie_offset;
-	struct wlan_ies ie;
+	struct element_info ie;
 
 	if (!session) {
 		pe_err("NULL session");
@@ -4399,7 +4399,7 @@ void lim_extract_ies_from_deauth_disassoc(struct pe_session *session,
 	if (!deauth_disassoc_frame || deauth_disassoc_frame_len <= ie_offset)
 		return;
 
-	ie.data = deauth_disassoc_frame + ie_offset;
+	ie.ptr = deauth_disassoc_frame + ie_offset;
 	ie.len = deauth_disassoc_frame_len - ie_offset;
 
 	mlme_set_peer_disconnect_ies(session->vdev, &ie);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -451,9 +451,9 @@ static void lim_process_sae_auth_frame(struct mac_context *mac_ctx,
 
 	sae_retry = mlme_get_sae_auth_retry(pe_session->vdev);
 	if (LIM_IS_STA_ROLE(pe_session) && sae_retry &&
-	    sae_retry->sae_auth.data) {
+	    sae_retry->sae_auth.ptr) {
 		if (lim_is_sae_auth_algo_match(
-		    sae_retry->sae_auth.data, sae_retry->sae_auth.len,
+		    sae_retry->sae_auth.ptr, sae_retry->sae_auth.len,
 		     rx_pkt_info))
 			lim_sae_auth_cleanup_retry(mac_ctx,
 						   pe_session->vdev_id);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1681,7 +1681,7 @@ static void lim_handle_sae_auth_timeout(struct mac_context *mac_ctx,
 	struct sae_auth_retry *sae_retry;
 
 	sae_retry = mlme_get_sae_auth_retry(session_entry->vdev);
-	if (!(sae_retry && sae_retry->sae_auth.data)) {
+	if (!(sae_retry && sae_retry->sae_auth.ptr)) {
 		pe_debug("sae auth frame is not buffered vdev id %d",
 			 session_entry->vdev_id);
 		return;
@@ -1690,7 +1690,7 @@ static void lim_handle_sae_auth_timeout(struct mac_context *mac_ctx,
 	pe_debug("retry sae auth for seq num %d vdev id %d",
 		 mac_ctx->mgmtSeqNum, session_entry->vdev_id);
 	lim_send_frame(mac_ctx, session_entry->vdev_id,
-		       sae_retry->sae_auth.data, sae_retry->sae_auth.len);
+		       sae_retry->sae_auth.ptr, sae_retry->sae_auth.len);
 
 	sae_retry->sae_auth_max_retry--;
 	/* Activate Auth Retry timer if max_retries are not done */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -3435,11 +3435,11 @@ static QDF_STATUS lim_deauth_tx_complete_cnf_handler(void *context,
  */
 static void
 lim_append_ies_to_frame(uint8_t *frame, uint32_t *frame_len,
-			struct wlan_ies *ie)
+			struct element_info *ie)
 {
-	if (!ie || !ie->len || !ie->data)
+	if (!ie || !ie->len || !ie->ptr)
 		return;
-	qdf_mem_copy(frame, ie->data, ie->len);
+	qdf_mem_copy(frame, ie->ptr, ie->len);
 	*frame_len += ie->len;
 	pe_debug("Appended IEs len: %u", ie->len);
 }
@@ -3474,7 +3474,7 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac,
 	uint8_t txFlag = 0;
 	uint32_t val = 0;
 	uint8_t smeSessionId = 0;
-	struct wlan_ies *discon_ie;
+	struct element_info *discon_ie;
 
 	if (!pe_session) {
 		return;
@@ -3675,7 +3675,7 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac,
 	tpDphHashNode sta;
 #endif
 	uint8_t smeSessionId = 0;
-	struct wlan_ies *discon_ie;
+	struct element_info *discon_ie;
 
 	if (!pe_session) {
 		return;
@@ -5726,16 +5726,16 @@ lim_handle_sae_auth_retry(struct mac_context *mac_ctx, uint8_t vdev_id,
 		return;
 	}
 
-	if (sae_retry->sae_auth.data)
+	if (sae_retry->sae_auth.ptr)
 		lim_sae_auth_cleanup_retry(mac_ctx, vdev_id);
 
-	sae_retry->sae_auth.data = qdf_mem_malloc(frame_len);
-	if (!sae_retry->sae_auth.data)
+	sae_retry->sae_auth.ptr = qdf_mem_malloc(frame_len);
+	if (!sae_retry->sae_auth.ptr)
 		return;
 
 	pe_debug("SAE auth frame queued vdev_id %d seq_num %d",
 		 vdev_id, mac_ctx->mgmtSeqNum);
-	qdf_mem_copy(sae_retry->sae_auth.data, frame, frame_len);
+	qdf_mem_copy(sae_retry->sae_auth.ptr, frame, frame_len);
 	mac_ctx->lim.lim_timers.g_lim_periodic_auth_retry_timer.sessionId =
 					session->peSessionId;
 	sae_retry->sae_auth.len = frame_len;

core/sme/inc/csr_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1059,7 +1059,7 @@ struct csr_roam_info {
 #endif
 	struct assoc_ind *owe_pending_assoc_ind;
 	uint16_t roam_reason;
-	struct wlan_ies *disconnect_ies;
+	struct element_info *disconnect_ies;
 };
 
 typedef struct sSirSmeAssocIndToUpperLayerCnf {

core/sme/src/common/sme_api.c

@@ -16208,7 +16208,7 @@ QDF_STATUS sme_set_disconnect_ies(mac_handle_t mac_handle, uint8_t vdev_id,
 {
 	struct mac_context *mac_ctx;
 	struct wlan_objmgr_vdev *vdev;
-	struct wlan_ies ie;
+	struct element_info ie;
 
 	if (!ie_data || !ie_len) {
 		sme_debug("Got NULL disconnect IEs");
@@ -16224,7 +16224,7 @@ QDF_STATUS sme_set_disconnect_ies(mac_handle_t mac_handle, uint8_t vdev_id,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	ie.data = ie_data;
+	ie.ptr = ie_data;
 	ie.len = ie_len;
 
 	mlme_set_self_disconnect_ies(vdev, &ie);