Update to reflect changes in net/if.h.

contrib/libpcap/gencode.c

@@ -33,9 +33,9 @@ struct rtentry;
 #endif
 
 #include <net/if.h>
+#include <net/ethernet.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
 
 #include <stdlib.h>
 #include <memory.h>

contrib/libpcap/nametoaddr.c

@@ -38,8 +38,8 @@ struct rtentry;
 #endif
 
 #include <net/if.h>
+#include <net/ethernet.h>
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
 #include <arpa/inet.h>
 
 #include <ctype.h>

contrib/tcpdump/addrtoname.c

@@ -37,7 +37,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 
 #include <arpa/inet.h>
 

contrib/tcpdump/print-arp.c

@@ -33,6 +33,7 @@ struct mbuf;
 struct rtentry;
 #endif
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>

contrib/tcpdump/print-atalk.c

@@ -39,7 +39,7 @@ struct rtentry;
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/tcp.h>

contrib/tcpdump/print-atm.c

@@ -34,7 +34,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>

contrib/tcpdump/print-bootp.c

@@ -36,7 +36,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 
 #include <ctype.h>
 #include <stdio.h>

contrib/tcpdump/print-domain.c

@@ -35,7 +35,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>

contrib/tcpdump/print-ether.c

@@ -34,7 +34,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>

contrib/tcpdump/print-fddi.c

@@ -38,7 +38,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 

contrib/tcpdump/print-icmp.c

@@ -35,7 +35,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>

contrib/tcpdump/print-isoclns.c

@@ -39,7 +39,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 
 #include <stdio.h>
 

contrib/tcpdump/print-nfs.c

@@ -31,7 +31,7 @@ static char rcsid[] =
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>

contrib/tcpdump/print-ntp.c

@@ -39,7 +39,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 
 #include <ctype.h>
 #include <stdio.h>

contrib/tcpdump/print-null.c

@@ -39,7 +39,7 @@ struct rtentry;
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>

contrib/tcpdump/print-ppp.c

@@ -47,7 +47,7 @@ struct rtentry;
 #include <signal.h>
 #include <stdio.h>
 
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include "ethertype.h"
 
 #include <net/ppp_defs.h>

contrib/tcpdump/print-sl.c

@@ -41,7 +41,7 @@ struct rtentry;
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>

contrib/tcpdump/print-sunrpc.c

@@ -35,7 +35,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>