Index: sys/net/if_tuntap.c
===================================================================
--- sys/net/if_tuntap.c
+++ sys/net/if_tuntap.c
@@ -110,7 +110,7 @@
 	u_short				 tun_flags;	/* misc flags */
 #define	TUN_OPEN	0x0001
 #define	TUN_INITED	0x0002
-#define	TUN_RCOLL	0x0004
+#define	TUN_RCOLL	0x0004	/* unused */
 #define	TUN_IASET	0x0008
 #define	TUN_DSTADDR	0x0010
 #define	TUN_LMODE	0x0020
@@ -168,9 +168,9 @@
 SYSCTL_DECL(_net_link);
 /* tun */
 static SYSCTL_NODE(_net_link, OID_AUTO, tun, CTLFLAG_RW, 0,
-    "IP tunnel software network interface.");
+    "IP tunnel software network interface");
 SYSCTL_INT(_net_link_tun, OID_AUTO, devfs_cloning, CTLFLAG_RWTUN, &tundclone, 0,
-    "Enable legacy devfs interface creation.");
+    "Enable legacy devfs interface creation");
 
 /* tap */
 static SYSCTL_NODE(_net_link, OID_AUTO, tap, CTLFLAG_RW, 0,
@@ -442,7 +442,7 @@
 		return (ENXIO);
 
 	if (unit != -1) {
-		/* If this unit number is still available that/s okay. */
+		/* If this unit number is still available that's okay. */
 		if (alloc_unr_specific(drv->unrhdr, unit) == -1)
 			return (EEXIST);
 	} else {
@@ -1435,22 +1435,22 @@
 
 	tp->tun_flags &= ~TUN_RWAIT;
 
-	do {
+	for (;;) {
 		IFQ_DEQUEUE(&ifp->if_snd, m);
-		if (m == NULL) {
-			if (flag & O_NONBLOCK) {
-				TUN_UNLOCK(tp);
-				return (EWOULDBLOCK);
-			}
-			tp->tun_flags |= TUN_RWAIT;
-			error = mtx_sleep(tp, &tp->tun_mtx, PCATCH | (PZERO + 1),
-			    "tunread", 0);
-			if (error != 0) {
-				TUN_UNLOCK(tp);
-				return (error);
-			}
+		if (m != NULL)
+			break;
+		if (flag & O_NONBLOCK) {
+			TUN_UNLOCK(tp);
+			return (EWOULDBLOCK);
 		}
-	} while (m == NULL);
+		tp->tun_flags |= TUN_RWAIT;
+		error = mtx_sleep(tp, &tp->tun_mtx, PCATCH | (PZERO + 1),
+		    "tunread", 0);
+		if (error != 0) {
+			TUN_UNLOCK(tp);
+			return (error);
+		}
+	}
 	TUN_UNLOCK(tp);
 
 	if ((tp->tun_flags & TUN_L2) != 0)
@@ -1629,8 +1629,7 @@
 		}
 		IFQ_UNLOCK(&ifp->if_snd);
 	}
-	if (events & (POLLOUT | POLLWRNORM))
-		revents |= events & (POLLOUT | POLLWRNORM);
+	revents |= events & (POLLOUT | POLLWRNORM);
 
 	return (revents);
 }