[PATCH v6 7/7] lib: remove ICMP and IPv6 deprecated functions and macros

From: Robin Jarry <[email protected]>

These symbols were marked as deprecated in DPDK 24.11. Remove them
completely.

Signed-off-by: Robin Jarry <[email protected]>
Acked-by: David Marchand <[email protected]>
---
 doc/guides/rel_notes/release_26_11.rst |  9 ++++
 lib/fib/rte_fib6.h                     |  5 --
 lib/lpm/rte_lpm6.h                     |  4 --
 lib/net/rte_icmp.h                     |  4 --
 lib/rib/rte_rib6.h                     | 74 --------------------------
 lib/table/rte_table_lpm_ipv6.h         |  3 --
 6 files changed, 9 insertions(+), 90 deletions(-)

diff --git a/doc/guides/rel_notes/release_26_11.rst b/doc/guides/rel_notes/release_26_11.rst
index 938617ca75..c8cc86295d 100644
--- a/doc/guides/rel_notes/release_26_11.rst
+++ b/doc/guides/rel_notes/release_26_11.rst
@@ -68,6 +68,15 @@ Removed Items
    Also, make sure to start the actual text at the margin.
    =======================================================
 
+* Removed deprecated symbols:
+
+  * fib: ``RTE_FIB6_IPV6_ADDR_SIZE``, ``RTE_FIB6_MAXDEPTH``
+  * lpm: ``RTE_LPM6_IPV6_ADDR_SIZE``, ``RTE_LPM6_MAX_DEPTH``
+  * net: ``RTE_IP_ICMP_ECHO_REPLY``, ``RTE_IP_ICMP_ECHO_REQUEST``
+  * rib: ``RTE_RIB6_IPV6_ADDR_SIZE``, ``get_msk_part``, ``rte_rib6_copy_addr``,
+    ``rte_rib6_is_equal``
+  * table: ``RTE_LPM_IPV6_ADDR_SIZE``
+
 
 API Changes
 -----------
diff --git a/lib/fib/rte_fib6.h b/lib/fib/rte_fib6.h
index 4527328bf0..fcbd10de15 100644
--- a/lib/fib/rte_fib6.h
+++ b/lib/fib/rte_fib6.h
@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 
-#include <rte_common.h>
 #include <rte_ip6.h>
 #include <rte_rcu_qsbr.h>
 
@@ -25,10 +24,6 @@
 extern "C" {
 #endif
 
-#define RTE_FIB6_IPV6_ADDR_SIZE (RTE_DEPRECATED(RTE_FIB6_IPV6_ADDR_SIZE) RTE_IPV6_ADDR_SIZE)
-/** Maximum depth value possible for IPv6 FIB. */
-#define RTE_FIB6_MAXDEPTH (RTE_DEPRECATED(RTE_FIB6_MAXDEPTH) RTE_IPV6_MAX_DEPTH)
-
 /* Maximum length of a FIB name. */
 #define RTE_FIB6_NAMESIZE	64
 
diff --git a/lib/lpm/rte_lpm6.h b/lib/lpm/rte_lpm6.h
index 08b5618613..c5928b9d88 100644
--- a/lib/lpm/rte_lpm6.h
+++ b/lib/lpm/rte_lpm6.h
@@ -11,16 +11,12 @@
 
 #include <stdint.h>
 
-#include <rte_common.h>
 #include <rte_ip6.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-#define RTE_LPM6_MAX_DEPTH (RTE_DEPRECATED(RTE_LPM6_MAX_DEPTH) RTE_IPV6_MAX_DEPTH)
-#define RTE_LPM6_IPV6_ADDR_SIZE (RTE_DEPRECATED(RTE_LPM6_IPV6_ADDR_SIZE) RTE_IPV6_ADDR_SIZE)
 /** Max number of characters in LPM name. */
 #define RTE_LPM6_NAMESIZE                 32
 
diff --git a/lib/net/rte_icmp.h b/lib/net/rte_icmp.h
index cca73b3733..a504c921de 100644
--- a/lib/net/rte_icmp.h
+++ b/lib/net/rte_icmp.h
@@ -51,13 +51,9 @@ struct __rte_packed_begin rte_icmp_hdr {
 
 /* ICMP packet types */
 #define RTE_ICMP_TYPE_ECHO_REPLY 0
-#define RTE_IP_ICMP_ECHO_REPLY \
-	(RTE_DEPRECATED(RTE_IP_ICMP_ECHO_REPLY) RTE_ICMP_TYPE_ECHO_REPLY)
 #define RTE_ICMP_TYPE_DEST_UNREACHABLE 3
 #define RTE_ICMP_TYPE_REDIRECT 5
 #define RTE_ICMP_TYPE_ECHO_REQUEST 8
-#define RTE_IP_ICMP_ECHO_REQUEST \
-	(RTE_DEPRECATED(RTE_IP_ICMP_ECHO_REQUEST) RTE_ICMP_TYPE_ECHO_REQUEST)
 #define RTE_ICMP_TYPE_TTL_EXCEEDED 11
 #define RTE_ICMP_TYPE_PARAM_PROBLEM 12
 #define RTE_ICMP_TYPE_TIMESTAMP_REQUEST 13
diff --git a/lib/rib/rte_rib6.h b/lib/rib/rte_rib6.h
index d66d9e7c07..e3fb464ae6 100644
--- a/lib/rib/rte_rib6.h
+++ b/lib/rib/rte_rib6.h
@@ -15,15 +15,12 @@
  */
 
 #include <rte_memcpy.h>
-#include <rte_common.h>
 #include <rte_ip6.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define RTE_RIB6_IPV6_ADDR_SIZE (RTE_DEPRECATED(RTE_RIB6_IPV6_ADDR_SIZE) RTE_IPV6_ADDR_SIZE)
-
 /**
  * rte_rib6_get_nxt() flags
  */
@@ -49,77 +46,6 @@ struct rte_rib6_conf {
 	int	max_nodes;
 };
 
-/**
- * Copy IPv6 address from one location to another
- *
- * @param dst
- *  pointer to the place to copy
- * @param src
- *  pointer from where to copy
- */
-static inline void rte_rib6_copy_addr(uint8_t *dst, const uint8_t *src)
-	__rte_deprecated_msg("use direct struct assignment");
-
-static inline void
-rte_rib6_copy_addr(uint8_t *dst, const uint8_t *src)
-{
-	if ((dst == NULL) || (src == NULL))
-		return;
-	rte_memcpy(dst, src, RTE_IPV6_ADDR_SIZE);
-}
-
-/**
- * Compare two IPv6 addresses
- *
- * @param ip1
- *  pointer to the first ipv6 address
- * @param ip2
- *  pointer to the second ipv6 address
- *
- * @return
- *  1 if equal
- *  0 otherwise
- */
-static inline int rte_rib6_is_equal(const uint8_t *ip1, const uint8_t *ip2)
-	__rte_deprecated_msg("use rte_ipv6_addr_eq");
-
-static inline int
-rte_rib6_is_equal(const uint8_t *ip1, const uint8_t *ip2) {
-	int i;
-
-	if ((ip1 == NULL) || (ip2 == NULL))
-		return 0;
-	for (i = 0; i < RTE_IPV6_ADDR_SIZE; i++) {
-		if (ip1[i] != ip2[i])
-			return 0;
-	}
-	return 1;
-}
-
-/**
- * Get 8-bit part of 128-bit IPv6 mask
- *
- * @param depth
- *  ipv6 prefix length
- * @param byte
- *  position of a 8-bit chunk in the 128-bit mask
- *
- * @return
- *  8-bit chunk of the 128-bit IPv6 mask
- */
-static inline uint8_t get_msk_part(uint8_t depth, int byte) __rte_deprecated;
-
-static inline uint8_t
-get_msk_part(uint8_t depth, int byte) {
-	uint8_t part;
-
-	byte &= 0xf;
-	depth = RTE_MIN(depth, 128);
-	part = RTE_MAX((int16_t)depth - (byte * 8), 0);
-	part = (part > 8) ? 8 : part;
-	return (uint16_t)(~UINT8_MAX) >> part;
-}
-
 /**
  * Lookup an IP into the RIB structure
  *
diff --git a/lib/table/rte_table_lpm_ipv6.h b/lib/table/rte_table_lpm_ipv6.h
index 3ea8883606..a9fbc906f3 100644
--- a/lib/table/rte_table_lpm_ipv6.h
+++ b/lib/table/rte_table_lpm_ipv6.h
@@ -39,7 +39,6 @@
 
 #include <stdint.h>
 
-#include <rte_common.h>
 #include <rte_ip6.h>
 
 #include "rte_table.h"
@@ -48,8 +47,6 @@
 extern "C" {
 #endif
 
-#define RTE_LPM_IPV6_ADDR_SIZE (RTE_DEPRECATED(RTE_LPM_IPV6_ADDR_SIZE) RTE_IPV6_ADDR_SIZE)
-
 /** LPM table parameters */
 struct rte_table_lpm_ipv6_params {
 	/** Table name */
-- 
2.55.0