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

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

12 files changed, 23 insertions, 22 deletions

diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index f6675a1..991d290 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c
@@ -25,7 +25,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/socket.h>
 #include <sys/conf.h>
 #include <sys/errno.h>
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index c33b9da..8adf4e6 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/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/i386/isa/if_eg.c b/sys/i386/isa/if_eg.c
index 1ccdc29..4718d04 100644
--- a/sys/i386/isa/if_eg.c
+++ b/sys/i386/isa/if_eg.c
@@ -27,7 +27,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$
+ * $Id: if_eg.c,v 1.22 1997/02/22 09:36:22 peter Exp $
  *
  * Support for 3Com 3c505 Etherlink+ card.
  */
@@ -43,7 +43,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/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index f09bf14..ca1618f 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
- * $Id$
+ * $Id: if_el.c,v 1.29 1997/02/22 09:36:23 peter Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -26,7 +26,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/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 304620b..bba5ca5 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/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/i386/isa/if_ex.c b/sys/i386/isa/if_ex.c
index e5c988c..4038414 100644
--- a/sys/i386/isa/if_ex.c
+++ b/sys/i386/isa/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/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index d1f91b4..4d6d344 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/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/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index c43283c..083ffae 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/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/i386/isa/if_ix.c b/sys/i386/isa/if_ix.c
index 461b5a9..998f690 100644
--- a/sys/i386/isa/if_ix.c
+++ b/sys/i386/isa/if_ix.c
@@ -28,7 +28,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$
+ *	$Id: if_ix.c,v 1.25 1997/02/22 09:36:31 peter Exp $
  */
 
 #include "ix.h"
@@ -38,7 +38,7 @@
 #include <sys/conf.h>
 #include <sys/mbuf.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/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 6af3880..f34471d 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id$
+ * $Id: if_ze.c,v 1.40 1997/02/22 09:36:37 peter Exp $
  */
 
 /* XXX - Don't mix different PCCARD support code */
@@ -69,7 +69,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/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index 62732a2..2398b40 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,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$
+ *	$Id: if_zp.c,v 1.34 1997/02/22 09:36:38 peter Exp $
  */
 /*-
  * TODO:
@@ -123,7 +123,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>
 
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 12d0b92..7c21b20 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id$
+ *	$Id: lpt.c,v 1.58 1997/02/22 09:36:51 peter Exp $
  */
 
 /*
@@ -109,7 +109,6 @@
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
-#include <sys/ioctl.h>
 #include <sys/uio.h>
 #include <sys/syslog.h>
 #ifdef DEVFS
@@ -130,6 +129,8 @@
 #ifdef INET
 #include <sys/mbuf.h>
 #include <sys/socket.h>
+#include <sys/sockio.h>
+
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/netisr.h>