diff options
author | peter <peter@FreeBSD.org> | 1999-01-17 20:53:48 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-01-17 20:53:48 +0000 |
commit | a33b0a11f43f771866680f1971483ea15bcbd92a (patch) | |
tree | 6d7b3127a3588330fc35dcb177d36fde65ceb475 /sys/net | |
parent | cb99881fc978223e309dce69a5a0e7ab3eb190d3 (diff) | |
download | FreeBSD-src-a33b0a11f43f771866680f1971483ea15bcbd92a.zip FreeBSD-src-a33b0a11f43f771866680f1971483ea15bcbd92a.tar.gz |
Undo #undef KERNEL hack for vnode.h to avoid vnode_if.h.
XXX It probably makes sense to have a flag for bsd.kern.mk to avoid these
rules.
XXX IO_NDELAY seems to be the main reason for it, when used in a cdevsw
read or write "flag" context. Perhaps a redundant declaration
somewhere like sys/conf.h might help remove the need for vnode.h in
these device drivers in the first place.
Diffstat (limited to 'sys/net')
-rw-r--r-- | sys/net/if_tun.c | 6 | ||||
-rw-r--r-- | sys/net/ppp_tty.c | 11 |
2 files changed, 2 insertions, 15 deletions
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 1e461aa..ed98e6c 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 dc48c8f..74e7172 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> |