summaryrefslogtreecommitdiffstats
path: root/sys/net
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1997-03-24 11:33:46 +0000
committerbde <bde@FreeBSD.org>1997-03-24 11:33:46 +0000
commite79c0a4ca0faee32b600b7c2b384b85fde731307 (patch)
tree02527e798dacc866eb4e0e16c035eefa20edc3f6 /sys/net
parent117209856b858251ebd6fec048828125547e131f (diff)
downloadFreeBSD-src-e79c0a4ca0faee32b600b7c2b384b85fde731307.zip
FreeBSD-src-e79c0a4ca0faee32b600b7c2b384b85fde731307.tar.gz
Don't include <sys/ioctl.h> in the kernel. Stage 2: include
<sys/sockio.h> instead of <sys/ioctl.h> in network files.
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if.c4
-rw-r--r--sys/net/if_disc.c4
-rw-r--r--sys/net/if_ethersubr.c4
-rw-r--r--sys/net/if_loop.c4
-rw-r--r--sys/net/if_sl.c4
-rw-r--r--sys/net/if_spppsubr.c4
6 files changed, 12 insertions, 12 deletions
diff --git a/sys/net/if.c b/sys/net/if.c
index 1bcb1d8..b1f7087 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if.c 8.3 (Berkeley) 1/4/94
- * $Id$
+ * $Id: if.c,v 1.45 1997/02/14 15:30:54 wollman Exp $
*/
#include <sys/param.h>
@@ -43,7 +43,7 @@
#include <sys/socketvar.h>
#include <sys/protosw.h>
#include <sys/kernel.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
#include <sys/errno.h>
#include <sys/syslog.h>
#include <sys/sysctl.h>
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index b6ba54e..ebeed07 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* From: @(#)if_loop.c 8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: if_disc.c,v 1.16 1997/02/22 09:40:59 peter Exp $
*/
/*
@@ -45,7 +45,7 @@
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/errno.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
#include <sys/time.h>
#include <net/if.h>
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index d8ad5e9..ae17b35 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: if_ethersubr.c,v 1.33 1997/02/22 09:41:00 peter Exp $
*/
#include <sys/param.h>
@@ -41,7 +41,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/syslog.h>
#include <sys/sysctl.h>
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 09fb730..50c208b 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_loop.c 8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: if_loop.c,v 1.25 1997/02/22 09:41:02 peter Exp $
*/
/*
@@ -46,7 +46,7 @@
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/errno.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
#include <sys/time.h>
#include <net/if.h>
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 3fa5e8a..b0d1b7a 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_sl.c 8.6 (Berkeley) 2/1/94
- * $Id: if_sl.c,v 1.50 1997/03/11 19:39:21 bde Exp $
+ * $Id: if_sl.c,v 1.51 1997/03/23 03:37:15 bde Exp $
*/
/*
@@ -77,7 +77,7 @@
#include <sys/buf.h>
#include <sys/dkstat.h>
#include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
#include <sys/fcntl.h>
#include <sys/signalvar.h>
#include <sys/tty.h>
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 5c03654..61c266f 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -14,14 +14,14 @@
*
* Version 1.9, Wed Oct 4 18:58:15 MSK 1995
*
- * $Id$
+ * $Id: if_spppsubr.c,v 1.16 1997/02/22 09:41:09 peter Exp $
*/
#undef DEBUG
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
#include <sys/socket.h>
#include <sys/mbuf.h>
OpenPOWER on IntegriCloud