NDOize 8 more small decoders

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 1ade6c260a3663b66a4caa489ec257f1510b1dc1..b2ca0d13ae4d99b980aa4f87887e29da537ae9ef 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -18,10 +18,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.106 2008-02-06 10:47:53 guy Exp $ (LBL)";
-#endif
 
 #define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
@@ -31,7 +27,6 @@ static const char rcsid[] _U_ =
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 
 #include "interface.h"
 #include "extract.h"
@@ -358,7 +353,7 @@ ethertype_print(netdissect_options *ndo,
 
        case ETHERTYPE_IPX:
                ND_PRINT((ndo, "(NOV-ETHII) "));
-               ipx_print(/*ndo,*/p, length);
+               ipx_print(ndo, p, length);
                return (1);
 
         case ETHERTYPE_ISO:
@@ -369,7 +364,7 @@ ethertype_print(netdissect_options *ndo,
        case ETHERTYPE_PPPOES:
        case ETHERTYPE_PPPOED2:
        case ETHERTYPE_PPPOES2:
-               pppoe_print(/*ndo,*/p, length);
+               pppoe_print(ndo, p, length);
                return (1);
 
        case ETHERTYPE_EAPOL:
@@ -405,11 +400,12 @@ ethertype_print(netdissect_options *ndo,
                return (1);
 
         case ETHERTYPE_LOOPBACK:
+               loopback_print(ndo, p, length);
                 return (1);
 
        case ETHERTYPE_MPLS:
        case ETHERTYPE_MPLS_MULTI:
-               mpls_print(/*ndo,*/p, length);
+               mpls_print(ndo, p, length);
                return (1);
 
        case ETHERTYPE_TIPC: