Network drivers should not include <net/route.h> or <net/netisr.h>

12 files changed, 12 insertions, 25 deletions

diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index eac3b48fb4d..3bcc6010ae9 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elink3.c,v 1.91 2015/11/25 03:09:58 dlg Exp $	*/
+/*	$OpenBSD: elink3.c,v 1.92 2015/11/25 11:20:38 mpi Exp $	*/
 /*	$NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $	*/
 
 /*
@@ -46,7 +46,6 @@
 #include <sys/device.h>
 
 #include <net/if.h>
-#include <net/netisr.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git a/sys/dev/ic/lemac.c b/sys/dev/ic/lemac.c
index 9434e5b398c..7c7756cfaa8 100644
--- a/sys/dev/ic/lemac.c
+++ b/sys/dev/ic/lemac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lemac.c,v 1.26 2015/11/25 03:09:58 dlg Exp $ */
+/* $OpenBSD: lemac.c,v 1.27 2015/11/25 11:20:38 mpi Exp $ */
 /* $NetBSD: lemac.c,v 1.20 2001/06/13 10:46:02 wiz Exp $ */
 
 /*-
@@ -45,7 +45,6 @@
 #include <sys/device.h>
 
 #include <net/if.h>
-#include <net/route.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git a/sys/dev/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c
index a6d1dc5e781..1e8045ec6da 100644
--- a/sys/dev/isa/if_ef_isapnp.c
+++ b/sys/dev/isa/if_ef_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ef_isapnp.c,v 1.35 2015/11/25 03:09:59 dlg Exp $	*/
+/*	$OpenBSD: if_ef_isapnp.c,v 1.36 2015/11/25 11:20:38 mpi Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -42,7 +42,6 @@
 #include <sys/timeout.h>
 
 #include <net/if.h>
-#include <net/netisr.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index 6187beaf40c..874d93184c3 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_eg.c,v 1.43 2015/11/25 03:09:59 dlg Exp $	*/
+/*	$OpenBSD: if_eg.c,v 1.44 2015/11/25 11:20:38 mpi Exp $	*/
 /*	$NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $	*/
 
 /*
@@ -52,7 +52,6 @@
 #include <sys/device.h>
 
 #include <net/if.h>
-#include <net/netisr.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c
index 79257a75e85..5855e6a8bbf 100644
--- a/sys/dev/isa/if_ep_isa.c
+++ b/sys/dev/isa/if_ep_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_isa.c,v 1.30 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_ep_isa.c,v 1.31 2015/11/25 11:20:38 mpi Exp $	*/
 /*	$NetBSD: if_ep_isa.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $	*/
 
 /*
@@ -51,7 +51,6 @@
 #include <sys/queue.h>
 
 #include <net/if.h>
-#include <net/netisr.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index bfbc63daff2..9a99ee0ee93 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.47 2015/11/25 03:09:59 dlg Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.48 2015/11/25 11:20:38 mpi Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $	*/
 
 /*-
@@ -121,8 +121,6 @@ iomem, and to make 16-pointers, we subtract sc_maddr and and with 0xffff.
 #include <sys/timeout.h>
 
 #include <net/if.h>
-#include <net/netisr.h>
-#include <net/route.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index e247c69dc81..158c83e24a2 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.131 2015/11/25 03:09:59 dlg Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.132 2015/11/25 11:20:38 mpi Exp $	*/
 /*	$NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $	*/
 
 /*-
@@ -53,7 +53,6 @@
 
 #include <net/if.h>
 #include <net/if_media.h>
-#include <net/netisr.h>
 
 #include "bpfilter.h"
 #if NBPFILTER > 0
diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index aad909cfd1f..71f8f2bb4ef 100644
--- a/sys/dev/pcmcia/if_ep_pcmcia.c
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_pcmcia.c,v 1.47 2015/11/24 17:11:40 mpi Exp $	*/
+/*	$OpenBSD: if_ep_pcmcia.c,v 1.48 2015/11/25 11:20:38 mpi Exp $	*/
 /*	$NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $  */
 
 /*-
@@ -74,7 +74,6 @@
 #include <sys/device.h>
 
 #include <net/if.h>
-#include <net/netisr.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index dacb19acb80..690a91213ac 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: be.c,v 1.38 2015/11/25 03:09:59 dlg Exp $	*/
+/*	$OpenBSD: be.c,v 1.39 2015/11/25 11:20:38 mpi Exp $	*/
 /*	$NetBSD: be.c,v 1.26 2001/03/20 15:39:20 pk Exp $	*/
 
 /*-
@@ -70,7 +70,6 @@
 #include <sys/malloc.h>
 
 #include <net/if.h>
-#include <net/netisr.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c
index 108f64047de..8dfa0988f21 100644
--- a/sys/dev/sbus/qe.c
+++ b/sys/dev/sbus/qe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qe.c,v 1.36 2015/11/25 03:09:59 dlg Exp $	*/
+/*	$OpenBSD: qe.c,v 1.37 2015/11/25 11:20:38 mpi Exp $	*/
 /*	$NetBSD: qe.c,v 1.16 2001/03/30 17:30:18 christos Exp $	*/
 
 /*-
@@ -80,7 +80,6 @@
 #include <sys/malloc.h>
 
 #include <net/if.h>
-#include <net/netisr.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git a/sys/dev/usb/if_ugl.c b/sys/dev/usb/if_ugl.c
index df3f92586db..ba8490ba575 100644
--- a/sys/dev/usb/if_ugl.c
+++ b/sys/dev/usb/if_ugl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ugl.c,v 1.17 2015/11/25 03:10:00 dlg Exp $	*/
+/*	$OpenBSD: if_ugl.c,v 1.18 2015/11/25 11:20:38 mpi Exp $	*/
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2013 SASANO Takayoshi <uaa@uaa.org.uk>
@@ -64,7 +64,6 @@
 #include <sys/device.h>
 
 #include <net/if.h>
-#include <net/netisr.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 9e8d688dc1b..3b9df986b38 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upl.c,v 1.69 2015/11/25 03:10:00 dlg Exp $ */
+/*	$OpenBSD: if_upl.c,v 1.70 2015/11/25 11:20:38 mpi Exp $ */
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -48,7 +48,6 @@
 
 #include <net/if.h>
 #include <net/if_types.h>
-#include <net/netisr.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>