3 files changed, 32 insertions, 36 deletions

diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 45caa819681f6..f8621edab622b 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * $Id: if_ed.c,v 1.31 1994/02/02 02:24:38 davidg Exp $
+ * $Id: if_ed.c,v 1.32 1994/02/02 14:05:53 davidg Exp $
  */
 
 #include "ed.h"
@@ -39,7 +39,6 @@
 #include "net/if.h"
 #include "net/if_dl.h"
 #include "net/if_types.h"
-#include "net/netisr.h"
 
 #ifdef INET
 #include "netinet/in.h"
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index b5db6f68c35ec..a59b39a0e7076 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_ep.c,v 1.5 1994/01/26 09:13:56 nate Exp $
+ *	$Id: if_ep.c,v 1.6 1994/01/26 20:18:56 nate Exp $
  */
 /*
  * TODO:
@@ -36,50 +36,48 @@
 
 #include "bpfilter.h"
 
-#include <sys/param.h>
+#include "sys/param.h"
 #if defined(__FreeBSD__)
-#include <sys/systm.h>
-#include <sys/kernel.h>
+#include "sys/systm.h"
+#include "sys/kernel.h"
 #endif
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
+#include "sys/mbuf.h"
+#include "sys/socket.h"
+#include "sys/ioctl.h"
+#include "sys/errno.h"
+#include "sys/syslog.h"
 #if defined(__NetBSD__)
-#include <sys/select.h>
+#include "sys/select.h"
 #endif
 
-#include <net/if.h>
-#include <net/netisr.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
-#include <net/netisr.h>
+#include "net/if.h"
+#include "net/if_dl.h"
+#include "net/if_types.h"
 
 #ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
+#include "netinet/in.h"
+#include "netinet/in_systm.h"
+#include "netinet/in_var.h"
+#include "netinet/ip.h"
+#include "netinet/if_ether.h"
 #endif
 
 #ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
+#include "netns/ns.h"
+#include "netns/ns_if.h"
 #endif
 
 #if NBPFILTER > 0
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
+#include "net/bpf.h"
+#include "net/bpfdesc.h"
 #endif
 
-#include <machine/pio.h>
+#include "machine/pio.h"
 
-#include <i386/isa/isa.h>
-#include <i386/isa/isa_device.h>
-#include <i386/isa/icu.h>
-#include <i386/isa/if_epreg.h>
+#include "i386/isa/isa.h"
+#include "i386/isa/isa_device.h"
+#include "i386/isa/icu.h"
+#include "i386/isa/if_epreg.h"
 
 #define ETHER_MIN_LEN	64
 #define ETHER_MAX_LEN	1518
@@ -473,7 +471,7 @@ startagain:
 
 			/* copy trailer_header into a data structure */
 			m_copydata(top, off, sizeof(struct trailer_header),
-			    &trailer_header.ether_type);
+			    (caddr_t)&trailer_header.ether_type);
 
 			/* copy residual data */
 			resid = trailer_header.ether_residual -
@@ -714,9 +712,9 @@ epread(sc)
 		 * there are no BPF listeners.  And if we are in promiscuous
 		 * mode, we have to check if this packet is really ours.
 		 */
-		if ((sc->ep_ac.ac_if.if_flags & IFF_PROMISC) &&
+		if ((sc->arpcom.ac_if.if_flags & IFF_PROMISC) &&
 		    (eh->ether_dhost[0] & 1) == 0 &&
-		    bcmp(eh->ether_dhost, sc->ep_ac.ac_enaddr,
+		    bcmp(eh->ether_dhost, sc->arpcom.ac_enaddr,
 			 sizeof(eh->ether_dhost)) != 0 &&
 		    bcmp(eh->ether_dhost, etherbroadcastaddr,
 			 sizeof(eh->ether_dhost)) != 0) {
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 613f03e348b7c..95095bdb515ba 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -39,7 +39,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.1 1993/10/12 06:52:31 rgrimes Exp $
+ *	$Id: if_ie.c,v 1.2 1993/11/25 01:31:36 wollman Exp $
  */
 
 /*
@@ -115,7 +115,6 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff.
 #include "net/if.h"
 #include "net/if_types.h"
 #include "net/if_dl.h"
-#include "net/netisr.h"
 #include "net/route.h"
 
 #include "bpfilter.h"