summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1997-03-24 12:12:36 +0000
committerbde <bde@FreeBSD.org>1997-03-24 12:12:36 +0000
commit8f145614c67a128a369472c42d4fd02759ae2e5a (patch)
tree1a3b38a757e0cdf91cd3545ef593af700a9df3d5 /sys
parent000a68175fce5c32b33f244fd256b37845f98d82 (diff)
downloadFreeBSD-src-8f145614c67a128a369472c42d4fd02759ae2e5a.zip
FreeBSD-src-8f145614c67a128a369472c42d4fd02759ae2e5a.tar.gz
Don't include <sys/ioctl.h> in the kernel. Stage 6: include
<sys/filio.h>, <sys/sockio.h> and <sys/ttycom.h> instead of <sys/ioctl.h> in a couple of files. This is still only 1/3 as spammish as <sys/ioctl.h> - 5 or 6 old tty ioctl headers aren't needed.
Diffstat (limited to 'sys')
-rw-r--r--sys/net/bpf.c6
-rw-r--r--sys/net/if_tun.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index db05aed..f892ad8 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
*
* @(#)bpf.c 8.2 (Berkeley) 3/28/94
*
- * $Id: bpf.c,v 1.29 1997/02/22 09:40:52 peter Exp $
+ * $Id: bpf.c,v 1.30 1997/03/23 03:37:14 bde Exp $
*/
#include "bpfilter.h"
@@ -58,7 +58,9 @@
#include <sys/time.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
+#include <sys/sockio.h>
+#include <sys/ttycom.h>
#include <sys/fcntl.h>
#if defined(sparc) && BSD < 199103
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index c58e265..c66360b 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -24,7 +24,9 @@
#include <sys/buf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
+#include <sys/sockio.h>
+#include <sys/ttycom.h>
#include <sys/errno.h>
#include <sys/syslog.h>
#include <sys/select.h>
OpenPOWER on IntegriCloud