Merge pull request #467 from wessels/master

[tcpdump] / print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index 039781ada2d1a751bd3f7ad0175356fe9d98d376..03ff1b3ee4b5ecc660e0b076f89add533317db31 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


@@ -186,11 +185,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
                break;
 
        case PT_IPV6:
                break;
 
        case PT_IPV6:

-#ifdef INET6

                ip6_print(ndo, p, length - (p - bp));
                ip6_print(ndo, p, length - (p - bp));

-#else
-               ND_PRINT((ndo, "IPv6, length: %u", length));
-#endif

                break;
 
        case PT_OSI:
                break;
 
        case PT_OSI: