From f62f3a112189d4e8340d72e42db3084169bc1fd7 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Wed, 22 Dec 2004 17:39:21 +0000
Subject: [PATCH] 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

---
 sys/net/if_tun.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 19b8b838c38..9103113b6ec 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);
 			}