X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/78651639891de4a150f23ab635ef940f6ee22d8e..HEAD:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index f910a780..324d089f 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -21,9 +21,7 @@
 
 /* \summary: Ethernet printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -171,9 +169,9 @@ ether_common_print(netdissect_options *ndo, const u_char *p, u_int length,
 	 */
 	ehp = (const struct ether_header *)p;
 	src.addr = ehp->ether_shost;
-	src.addr_string = mac64_string;
+	src.addr_string = mac48_string;
 	dst.addr = ehp->ether_dhost;
-	dst.addr_string = mac64_string;
+	dst.addr_string = mac48_string;
 
 	length -= 2*MAC48_LEN;
 	caplen -= 2*MAC48_LEN;
@@ -412,7 +410,7 @@ invalid:
 }
 
 /*
- * Print an Ethernet frame while specyfing a non-standard Ethernet header
+ * Print an Ethernet frame while specifying a non-standard Ethernet header
  * length.
  * This might be encapsulated within another frame; we might be passed
  * a pointer to a function that can print header information for that
@@ -481,7 +479,7 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	 * Fail if we don't have enough data for the Hilscher pseudo-header.
 	 */
 	ndo->ndo_protocol = "netanalyzer";
-	ND_TCHECK_LEN(p, 4);
+	ND_TCHECK_4(p);
 
 	/* Skip the pseudo-header. */
 	ndo->ndo_ll_hdr_len += 4;