Merge branch 'master' of git://github.com/mcr/tcpdump

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 76505721af3e0594589fd7caa449f8148d7525c9..e2f487c2a36ac49bbb486789e6b0ac4ef74b0418 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -37,7 +37,6 @@ static const char rcsid[] _U_ =
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
-
 #include "ether.h"
 
 const struct tok ethertype_values[] = { 
@@ -84,6 +83,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_CFM_OLD,        "CFM (old)" },
     { ETHERTYPE_CFM,            "CFM" },
     { ETHERTYPE_LLDP,           "LLDP" },
+    { ETHERTYPE_TIPC,           "TIPC"},       
     { 0, NULL}
 };
 
@@ -408,6 +408,10 @@ ethertype_print(netdissect_options *ndo,
                mpls_print(/*ndo,*/p, length);
                return (1);
 
+       case ETHERTYPE_TIPC:
+               tipc_print(ndo, p, length, caplen);
+               return (1);
+
        case ETHERTYPE_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC: