X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/81dbf4a0b05092760d0ff0cdd48c692e4769ba99..59ddbc3fd41600c293c05cd75b3bdc80ff8eb18f:/print-gre.c

diff --git a/print-gre.c b/print-gre.c
index 53c418fb..b1a81429 100644
--- a/print-gre.c
+++ b/print-gre.c
@@ -39,8 +39,6 @@
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
 #include "netdissect.h"
 #include "addrtostr.h"
 #include "extract.h"
@@ -52,7 +50,6 @@
 #define	GRE_KP		0x2000		/* key present */
 #define	GRE_SP		0x1000		/* sequence# present */
 #define	GRE_sP		0x0800		/* source routing */
-#define	GRE_RECRS	0x0700		/* recursion count */
 #define	GRE_AP		0x0080		/* acknowledgment# present */
 
 static const struct tok gre_flag_values[] = {
@@ -61,11 +58,11 @@ static const struct tok gre_flag_values[] = {
     { GRE_KP, "key present"},
     { GRE_SP, "sequence# present"},
     { GRE_sP, "source routing present"},
-    { GRE_RECRS, "recursion count"},
     { GRE_AP, "ack present"},
     { 0, NULL }
 };
 
+#define	GRE_RECRS_MASK	0x0700		/* recursion count */
 #define	GRE_VERS_MASK	0x0007		/* protocol version */
 
 /* source route entry types */
@@ -105,7 +102,6 @@ gre_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
 trunc:
 	nd_print_trunc(ndo);
-	return;
 }
 
 static void
@@ -224,7 +220,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
 		isoclns_print(ndo, bp, len);
 		break;
 	case ETHERTYPE_TEB:
-		ether_print(ndo, bp, len, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL, FALSE);
+		ether_print(ndo, bp, len, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL);
 		break;
 	default:
 		ND_PRINT("gre-proto-0x%x", prot);