diff options
| author | phk <phk@FreeBSD.org> | 2004-12-22 17:39:21 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-12-22 17:39:21 +0000 |
| commit | cc0d4329c3b960d1d20925d96394ab1ac11ff8f2 (patch) | |
| tree | fb7e77bda749ed01d3f69cbcfb3b8611f27e8d5d /sys/net/if_tun.c | |
| parent | 3fdb7bea32ee5b49b0ac64ab19301c100770c942 (diff) | |
| download | FreeBSD-src-cc0d4329c3b960d1d20925d96394ab1ac11ff8f2.zip FreeBSD-src-cc0d4329c3b960d1d20925d96394ab1ac11ff8f2.tar.gz | |
Include fcntl.h
Include selinfo.h (don't rely on vnode.h to do so)
Check O_NONBLOCK instead of IO_NELAY
Don't include vnode.h
Diffstat (limited to 'sys/net/if_tun.c')
| -rw-r--r-- | sys/net/if_tun.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 19b8b83..9103113 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -29,17 +29,18 @@ #include <sys/mbuf.h> #include <sys/module.h> #include <sys/socket.h> +#include <sys/fcntl.h> #include <sys/filio.h> #include <sys/sockio.h> #include <sys/ttycom.h> #include <sys/poll.h> +#include <sys/selinfo.h> #include <sys/signalvar.h> #include <sys/filedesc.h> #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/conf.h> #include <sys/uio.h> -#include <sys/vnode.h> #include <sys/malloc.h> #include <sys/random.h> @@ -701,7 +702,7 @@ tunread(struct cdev *dev, struct uio *uio, int flag) do { IFQ_DEQUEUE(&ifp->if_snd, m); if (m == NULL) { - if (flag & IO_NDELAY) { + if (flag & O_NONBLOCK) { splx(s); return (EWOULDBLOCK); } |
