X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fc80a87e4c7e921dca5edcf53373f60a76123a41..41f87a79787f53df8a36796b7029e6c642cb1e23:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index c8fb45d3..87b77d3f 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.92 2004-04-30 16:42:15 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.95.2.1 2005-04-25 17:57:15 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -71,6 +71,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_JUMBO,          "Jumbo" },
     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_ISO,            "OSI" },
+    { ETHERTYPE_GRE_ISO,        "GRE-OSI" },
     { 0, NULL}
 };
 
@@ -185,7 +186,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
 	switch (ether_type) {
 
 	case ETHERTYPE_IP:
-		ip_print(p, length);
+	        ip_print(gndo, p, length);
 		return (1);
 
 #ifdef INET6
@@ -312,9 +313,11 @@ ether_encap_print(u_short ether_type, const u_char *p,
 	}
 }
 
+
 /*
  * Local Variables:
- * c-style: bsd
+ * c-style: whitesmith
+ * c-basic-offset: 8
  * End:
  */