Don't include <sys/ioctl.h> in the kernel. Stage 2: include

<sys/sockio.h> instead of <sys/ioctl.h> in network files.

9 files changed, 16 insertions, 16 deletions

diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 788db438221e..e3c4fb09b59a 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_de.c,v 1.61 1997/03/20 07:25:22 kato Exp $
+ * $Id: if_de.c,v 1.62 1997/03/23 05:10:14 kato Exp $
  *
  */
 
@@ -40,7 +40,7 @@
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index c33b9da6939c..8adf4e6d3db1 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: if_ed.c,v 1.115 1997/02/22 09:36:20 peter Exp $
  */
 
 /*
@@ -44,7 +44,7 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 304620bb9233..bba5ca56d4ae 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id$
+ *  $Id: if_ep.c,v 1.57 1997/02/22 09:36:25 peter Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -69,7 +69,7 @@
 #endif
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 #if defined(__NetBSD__)
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index e5c988cf1e6e..4038414c9d80 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -42,7 +42,7 @@
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index d1f91b42a73c..4d6d344d9655 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id$
+ * $Id: if_fe.c,v 1.27 1997/02/22 09:36:27 peter Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -81,7 +81,7 @@
 #include <sys/conf.h>
 
 #include <sys/errno.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 55b15fa35339..4afce2a24924 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.30 1997/03/17 11:08:14 davidg Exp $
+ *	$Id: if_fxp.c,v 1.31 1997/03/21 08:00:11 davidg Exp $
  */
 
 /*
@@ -35,7 +35,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index c43283c8d267..083ffae53935 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: if_ie.c,v 1.39 1997/02/22 09:36:29 peter Exp $
  */
 
 /*
@@ -114,7 +114,7 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff.
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 8efa8c7f612d..8f7012ee4141 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdq_ifsubr.c,v 1.2 1997/01/17 23:54:32 joerg Exp $
+ * $Id: pdq_ifsubr.c,v 1.3 1997/01/18 13:03:21 joerg Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #if defined(__bsdi__) || defined(__NetBSD__)
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 41dfb865a9d4..7316b4f36304 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -66,7 +66,7 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>