From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Fri, 14 Feb 2025 21:18:56 +0000 (+0100)
Subject: ICMPv6: Delete some duplicate macros
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/82e16a6368c05fc4d6cc537c07656183f364a23c

ICMPv6: Delete some duplicate macros

Keep macros with names similar to IANA names.

(cherry picked from commit 434d67af40e92abafb32b36d7dcfbc4b1d8413bd)
---

diff --git a/print-icmp6.c b/print-icmp6.c
index e67b19b4..3ca09329 100644
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -100,11 +100,8 @@ struct icmp6_hdr {
 
 #define ICMP6_ECHO_REQUEST		128	/* echo service */
 #define ICMP6_ECHO_REPLY		129	/* echo reply */
-#define ICMP6_MEMBERSHIP_QUERY		130	/* group membership query */
 #define MLD6_LISTENER_QUERY		130	/* multicast listener query */
-#define ICMP6_MEMBERSHIP_REPORT		131	/* group membership report */
 #define MLD6_LISTENER_REPORT		131	/* multicast listener report */
-#define ICMP6_MEMBERSHIP_REDUCTION	132	/* group membership termination */
 #define MLD6_LISTENER_DONE		132	/* multicast listener done */
 
 #define ND_ROUTER_SOLICIT		133	/* router solicitation */
@@ -1152,7 +1149,7 @@ icmp6_print(netdissect_options *ndo,
                 ND_PRINT(", id %u, seq %u", GET_BE_U_2(dp->icmp6_id),
 			 GET_BE_U_2(dp->icmp6_seq));
 		break;
-	case ICMP6_MEMBERSHIP_QUERY:
+	case MLD6_LISTENER_QUERY:
 		if (length == MLD_MINLEN) {
 			mld6_print(ndo, (const u_char *)dp);
 		} else if (length >= MLDV2_MINLEN) {
@@ -1162,10 +1159,10 @@ icmp6_print(netdissect_options *ndo,
                         ND_PRINT(" unknown-version (len %u) ", length);
 		}
 		break;
-	case ICMP6_MEMBERSHIP_REPORT:
+	case MLD6_LISTENER_REPORT:
 		mld6_print(ndo, (const u_char *)dp);
 		break;
-	case ICMP6_MEMBERSHIP_REDUCTION:
+	case MLD6_LISTENER_DONE:
 		mld6_print(ndo, (const u_char *)dp);
 		break;
 	case ND_ROUTER_SOLICIT: