diff options
| author | bde <bde@FreeBSD.org> | 1997-03-24 11:33:46 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-03-24 11:33:46 +0000 |
| commit | e79c0a4ca0faee32b600b7c2b384b85fde731307 (patch) | |
| tree | 02527e798dacc866eb4e0e16c035eefa20edc3f6 /sys | |
| parent | 117209856b858251ebd6fec048828125547e131f (diff) | |
| download | FreeBSD-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')
37 files changed, 70 insertions, 69 deletions
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index 788db43..e3c4fb0 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 c33b9da..8adf4e6 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 304620b..bba5ca5 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 e5c988c..4038414 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 d1f91b4..4d6d344 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 55b15fa..4afce2a 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 c43283c..083ffae 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 8efa8c7..8f7012e 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 41dfb86..7316b4f 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> 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> 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> diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c index 4d8f8fa..ec3b997 100644 --- a/sys/netatalk/at_control.c +++ b/sys/netatalk/at_control.c @@ -8,7 +8,7 @@ #include <sys/proc.h> #include <sys/types.h> #include <sys/errno.h> -#include <sys/ioctl.h> +#include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/kernel.h> #include <sys/socket.h> diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 62bb320..17e8a88 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. * * @(#)in.c 8.4 (Berkeley) 1/9/95 - * $Id$ + * $Id: in.c,v 1.32 1997/02/22 09:41:27 peter Exp $ */ #include <sys/param.h> #include <sys/queue.h> #include <sys/systm.h> -#include <sys/ioctl.h> +#include <sys/sockio.h> #include <sys/errno.h> #include <sys/malloc.h> #include <sys/socket.h> diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 9c61921..b539641 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -9,7 +9,7 @@ * Modified by Bill Fenner, PARC, April 1995 * * MROUTING Revision: 3.5 - * $Id$ + * $Id: ip_mroute.c,v 1.38 1997/02/21 18:34:58 wollman Exp $ */ #include "opt_mrouting.h" @@ -24,7 +24,7 @@ #include <sys/errno.h> #include <sys/time.h> #include <sys/kernel.h> -#include <sys/ioctl.h> +#include <sys/sockio.h> #include <sys/syslog.h> #include <net/if.h> #include <net/route.h> diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c index 3f29f8f..77b11e6 100644 --- a/sys/netipx/ipx.c +++ b/sys/netipx/ipx.c @@ -33,14 +33,14 @@ * * @(#)ipx.c * - * $Id$ + * $Id: ipx.c,v 1.7 1997/02/22 09:41:51 peter Exp $ */ #include <sys/param.h> #include <sys/queue.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/ioctl.h> +#include <sys/sockio.h> #include <sys/protosw.h> #include <sys/errno.h> #include <sys/socket.h> diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c index 2452753..29cbf78 100644 --- a/sys/netipx/ipx_ip.c +++ b/sys/netipx/ipx_ip.c @@ -33,7 +33,7 @@ * * @(#)ipx_ip.c * - * $Id$ + * $Id: ipx_ip.c,v 1.12 1997/02/22 09:41:54 peter Exp $ */ /* @@ -49,7 +49,7 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/errno.h> -#include <sys/ioctl.h> +#include <sys/sockio.h> #include <sys/protosw.h> #include <net/if.h> diff --git a/sys/netipx/ipx_tun.c b/sys/netipx/ipx_tun.c index 0f7fa4e..0413f7e 100644 --- a/sys/netipx/ipx_tun.c +++ b/sys/netipx/ipx_tun.c @@ -33,7 +33,7 @@ * * @(#)ipx_tun.c * - * $Id$ + * $Id: ipx_tun.c,v 1.6 1997/02/22 09:41:57 peter Exp $ */ /* @@ -49,7 +49,7 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/errno.h> -#include <sys/ioctl.h> +#include <sys/sockio.h> #include <sys/protosw.h> #include <net/if.h> diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index 0fe11d0..fcc6a4c 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -34,12 +34,12 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95 - * $Id$ + * $Id: nfs_vfsops.c,v 1.35 1997/02/22 09:42:44 peter Exp $ */ #include <sys/param.h> #include <sys/conf.h> -#include <sys/ioctl.h> +#include <sys/sockio.h> #include <sys/signal.h> #include <sys/proc.h> #include <sys/namei.h> diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index 0fe11d0..fcc6a4c 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -34,12 +34,12 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95 - * $Id$ + * $Id: nfs_vfsops.c,v 1.35 1997/02/22 09:42:44 peter Exp $ */ #include <sys/param.h> #include <sys/conf.h> -#include <sys/ioctl.h> +#include <sys/sockio.h> #include <sys/signal.h> #include <sys/proc.h> #include <sys/namei.h> diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c index 788db43..e3c4fb0 100644 --- a/sys/pci/if_de.c +++ b/sys/pci/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/pci/if_fxp.c b/sys/pci/if_fxp.c index 55b15fa..4afce2a 100644 --- a/sys/pci/if_fxp.c +++ b/sys/pci/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> |
