X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1fe6e66ecec3fb7a7cc729038012cbb264542331..refs/pull/433/head:/print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index d777a952..c4ff16ab 100644
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -30,7 +30,7 @@ static const struct tok ipnet_values[] = {
 };
 
 static inline void
-ipnet_hdr_print(struct netdissect_options *ndo, const u_char *bp, u_int length)
+ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
 	const ipnet_hdr_t *hdr;
 	hdr = (const ipnet_hdr_t *)bp;
@@ -53,7 +53,7 @@ ipnet_hdr_print(struct netdissect_options *ndo, const u_char *bp, u_int length)
 }
 
 static void
-ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
+ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 {
 	ipnet_hdr_t *hdr;
 
@@ -76,11 +76,9 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int
 	        ip_print(ndo, p, length);
 		break;
 
-#ifdef INET6
 	case IPH_AF_INET6:
 		ip6_print(ndo, p, length);
 		break;
-#endif /*INET6*/
 
 	default:
 		if (!ndo->ndo_eflag)
@@ -88,7 +86,7 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int
 					length + sizeof(ipnet_hdr_t));
 
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 		break;
 	}
 }
@@ -100,7 +98,7 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int
  * is the number of bytes actually captured.
  */
 u_int
-ipnet_if_print(struct netdissect_options *ndo,
+ipnet_if_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {
 	ipnet_print(ndo, p, h->len, h->caplen);