Fix a bunch of de-constifications.

[tcpdump] / print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index bf232ae3a83caa4b48ed3e1532d231a4f04b559b..03ff1b3ee4b5ecc660e0b076f89add533317db31 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -59,8 +58,8 @@ void
 mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
        const u_char *p;
-       u_int32_t label_entry;
-       u_int16_t label_stack_depth = 0;
+       uint32_t label_entry;
+       uint16_t label_stack_depth = 0;
        enum mpls_packet_type pt = PT_UNKNOWN;
 
        p = bp;
@@ -186,11 +185,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
                break;
 
        case PT_IPV6:
-#ifdef INET6
                ip6_print(ndo, p, length - (p - bp));
-#else
-               ND_PRINT((ndo, "IPv6, length: %u", length));
-#endif
                break;
 
        case PT_OSI: