diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1999-01-17 20:53:48 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1999-01-17 20:53:48 +0000 |
| commit | 8e203b83a73f03729c96c1b2c6686551d8182f75 (patch) | |
| tree | 58d191f500f2353bc19c3792868345bcd7b9205b /sys | |
| parent | 1351d07f0d46aeddc171e81958f0ebe719d72802 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/modules/if_ppp/Makefile | 5 | ||||
| -rw-r--r-- | sys/modules/if_tun/Makefile | 5 | ||||
| -rw-r--r-- | sys/net/if_tun.c | 6 | ||||
| -rw-r--r-- | sys/net/ppp_tty.c | 11 |
4 files changed, 8 insertions, 19 deletions
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile index 34b90d8ec4eaa..97c3b3c2df725 100644 --- a/sys/modules/if_ppp/Makefile +++ b/sys/modules/if_ppp/Makefile @@ -1,10 +1,11 @@ -# $Id: Makefile,v 1.14 1998/03/27 04:05:08 peter Exp $ +# $Id: Makefile,v 1.15 1998/10/16 04:30:44 peter Exp $ .PATH: ${.CURDIR}/../../net KMOD= if_ppp SRCS= if_ppp.c ppp_tty.c slcompress.c \ - bpfilter.h ppp.h opt_inet.h opt_ipx.h opt_ppp.h + bpfilter.h ppp.h opt_inet.h opt_ipx.h opt_ppp.h vnode_if.h NOMAN= +CLEANFILES+= vnode_if.c vnode_if.h NPPP?= 2 PPP_BSDCOMP?= 1 # 0/1 diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile index 2581e361e23d7..7fadb7fa71266 100644 --- a/sys/modules/if_tun/Makefile +++ b/sys/modules/if_tun/Makefile @@ -1,9 +1,10 @@ -# $Id: Makefile,v 1.6 1998/02/01 18:12:14 bde Exp $ +# $Id: Makefile,v 1.7 1998/10/16 04:30:45 peter Exp $ .PATH: ${.CURDIR}/../../net KMOD= if_tun -SRCS= if_tun.c bpfilter.h opt_devfs.h opt_inet.h tun.h +SRCS= if_tun.c bpfilter.h opt_devfs.h opt_inet.h tun.h vnode_if.h NOMAN= +CLEANFILES+= vnode_if.h vnode_if.c NBPFILTER?= 0 NTUN?= 2 diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 1e461aa1ecd17..ed98e6c0a539a 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -38,13 +38,7 @@ #endif /*DEVFS*/ #include <sys/conf.h> #include <sys/uio.h> -/* - * XXX stop <sys/vnode.h> from including <vnode_if.h>. <vnode_if.h> doesn't - * exist if we are an LKM. - */ -#undef KERNEL #include <sys/vnode.h> -#define KERNEL #include <net/if.h> #include <net/netisr.h> diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c index dc48c8f2b4100..74e7172f960ce 100644 --- a/sys/net/ppp_tty.c +++ b/sys/net/ppp_tty.c @@ -70,7 +70,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $Id: ppp_tty.c,v 1.36 1998/06/07 17:12:07 dfr Exp $ */ +/* $Id: ppp_tty.c,v 1.37 1998/06/20 16:39:35 peter Exp $ */ #include "ppp.h" #if NPPP > 0 @@ -89,14 +89,7 @@ #include <sys/tty.h> #include <sys/conf.h> #include <sys/uio.h> - -/* - * XXX stop <sys/vnode.h> from including <vnode_if.h>. <vnode_if.h> doesn't - * exist if we are an LKM. - */ -#undef KERNEL -# include <sys/vnode.h> -#define KERNEL +#include <sys/vnode.h> #ifdef __i386__ #include <i386/isa/intr_machdep.h> |