diff options
| author | phk <phk@FreeBSD.org> | 2004-12-22 17:38:43 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-12-22 17:38:43 +0000 |
| commit | 3fdb7bea32ee5b49b0ac64ab19301c100770c942 (patch) | |
| tree | df8c2d8eca59a889c2debbe3e13092b4cae55c69 /sys/net/if_tap.c | |
| parent | 0970167e88bca4cf2d55e9a9a4fd6d566e8e084b (diff) | |
| download | FreeBSD-src-3fdb7bea32ee5b49b0ac64ab19301c100770c942.zip FreeBSD-src-3fdb7bea32ee5b49b0ac64ab19301c100770c942.tar.gz | |
Don't include filedesc.h
Include fcntl.h
Include selinfo.h (don't rely on vnode.h to do so)
Check O_NONBLOCK instead of IO_NDELAY
Don't include vnode.h
Diffstat (limited to 'sys/net/if_tap.c')
| -rw-r--r-- | sys/net/if_tap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c index 05b037f..3642097 100644 --- a/sys/net/if_tap.c +++ b/sys/net/if_tap.c @@ -39,7 +39,7 @@ #include <sys/param.h> #include <sys/conf.h> -#include <sys/filedesc.h> +#include <sys/fcntl.h> #include <sys/filio.h> #include <sys/kernel.h> #include <sys/malloc.h> @@ -47,6 +47,7 @@ #include <sys/module.h> #include <sys/poll.h> #include <sys/proc.h> +#include <sys/selinfo.h> #include <sys/signalvar.h> #include <sys/socket.h> #include <sys/sockio.h> @@ -54,7 +55,6 @@ #include <sys/systm.h> #include <sys/ttycom.h> #include <sys/uio.h> -#include <sys/vnode.h> #include <sys/queue.h> #include <net/bpf.h> @@ -752,7 +752,7 @@ tapread(dev, uio, flag) splx(s); if (m == NULL) { - if (flag & IO_NDELAY) + if (flag & O_NONBLOCK) return (EWOULDBLOCK); mtx_lock(&tp->tap_mtx); |
