From ee3e76337136982bd2409a691664d03bdf9cafc6 Mon Sep 17 00:00:00 2001
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Fri, 3 Jan 1997 20:10:04 +0000
Subject: [PATCH] Update to reflect changes in net/if.h.

---
 contrib/libpcap/gencode.c       | 2 +-
 contrib/libpcap/nametoaddr.c    | 2 +-
 contrib/tcpdump/addrtoname.c    | 2 +-
 contrib/tcpdump/print-arp.c     | 1 +
 contrib/tcpdump/print-atalk.c   | 2 +-
 contrib/tcpdump/print-atm.c     | 2 +-
 contrib/tcpdump/print-bootp.c   | 2 +-
 contrib/tcpdump/print-domain.c  | 2 +-
 contrib/tcpdump/print-ether.c   | 2 +-
 contrib/tcpdump/print-fddi.c    | 2 +-
 contrib/tcpdump/print-icmp.c    | 2 +-
 contrib/tcpdump/print-isoclns.c | 2 +-
 contrib/tcpdump/print-nfs.c     | 2 +-
 contrib/tcpdump/print-ntp.c     | 2 +-
 contrib/tcpdump/print-null.c    | 2 +-
 contrib/tcpdump/print-ppp.c     | 2 +-
 contrib/tcpdump/print-sl.c      | 2 +-
 contrib/tcpdump/print-sunrpc.c  | 2 +-
 18 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/contrib/libpcap/gencode.c b/contrib/libpcap/gencode.c
index 405c97c3cf1..d218b93597f 100644
--- a/contrib/libpcap/gencode.c
+++ b/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>
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c
index 6e50138682c..7cd5c4d0fef 100644
--- a/contrib/libpcap/nametoaddr.c
+++ b/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>
diff --git a/contrib/tcpdump/addrtoname.c b/contrib/tcpdump/addrtoname.c
index 8bfc3c379b4..11d150f2193 100644
--- a/contrib/tcpdump/addrtoname.c
+++ b/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>
 
diff --git a/contrib/tcpdump/print-arp.c b/contrib/tcpdump/print-arp.c
index 14f6d8e558f..e58aeab2d00 100644
--- a/contrib/tcpdump/print-arp.c
+++ b/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>
diff --git a/contrib/tcpdump/print-atalk.c b/contrib/tcpdump/print-atalk.c
index aa64fafbe9c..e81afb120fb 100644
--- a/contrib/tcpdump/print-atalk.c
+++ b/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>
diff --git a/contrib/tcpdump/print-atm.c b/contrib/tcpdump/print-atm.c
index f8754a1adcd..e07fa2a6fcd 100644
--- a/contrib/tcpdump/print-atm.c
+++ b/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>
diff --git a/contrib/tcpdump/print-bootp.c b/contrib/tcpdump/print-bootp.c
index 0a699f124ca..4402e499caa 100644
--- a/contrib/tcpdump/print-bootp.c
+++ b/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>
diff --git a/contrib/tcpdump/print-domain.c b/contrib/tcpdump/print-domain.c
index cbeae4ba1b2..e6651e7ae59 100644
--- a/contrib/tcpdump/print-domain.c
+++ b/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>
diff --git a/contrib/tcpdump/print-ether.c b/contrib/tcpdump/print-ether.c
index 405f495a9c4..bab00596d90 100644
--- a/contrib/tcpdump/print-ether.c
+++ b/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>
diff --git a/contrib/tcpdump/print-fddi.c b/contrib/tcpdump/print-fddi.c
index 59999b86065..c5775629f7a 100644
--- a/contrib/tcpdump/print-fddi.c
+++ b/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>
 
diff --git a/contrib/tcpdump/print-icmp.c b/contrib/tcpdump/print-icmp.c
index 429000b1a42..a94dd138838 100644
--- a/contrib/tcpdump/print-icmp.c
+++ b/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>
diff --git a/contrib/tcpdump/print-isoclns.c b/contrib/tcpdump/print-isoclns.c
index 4a214b574ba..d5e1496e193 100644
--- a/contrib/tcpdump/print-isoclns.c
+++ b/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>
 
diff --git a/contrib/tcpdump/print-nfs.c b/contrib/tcpdump/print-nfs.c
index da7145878ab..c7055740764 100644
--- a/contrib/tcpdump/print-nfs.c
+++ b/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>
diff --git a/contrib/tcpdump/print-ntp.c b/contrib/tcpdump/print-ntp.c
index ec6c8f00f18..eedca7a4d2b 100644
--- a/contrib/tcpdump/print-ntp.c
+++ b/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>
diff --git a/contrib/tcpdump/print-null.c b/contrib/tcpdump/print-null.c
index 89e16950f3d..eaa8a26e8c2 100644
--- a/contrib/tcpdump/print-null.c
+++ b/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>
diff --git a/contrib/tcpdump/print-ppp.c b/contrib/tcpdump/print-ppp.c
index 2c21c2bc6a8..50c3c2aa6b9 100644
--- a/contrib/tcpdump/print-ppp.c
+++ b/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>
diff --git a/contrib/tcpdump/print-sl.c b/contrib/tcpdump/print-sl.c
index 631714d454c..97a283b2280 100644
--- a/contrib/tcpdump/print-sl.c
+++ b/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>
diff --git a/contrib/tcpdump/print-sunrpc.c b/contrib/tcpdump/print-sunrpc.c
index 71055aa1953..281194a498d 100644
--- a/contrib/tcpdump/print-sunrpc.c
+++ b/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>