Index: if_tun.c
===================================================================
RCS file: /cvs/src/sys/net/if_tun.c,v
retrieving revision 1.185
diff -u -p -r1.185 if_tun.c
--- if_tun.c	1 May 2019 06:11:46 -0000	1.185
+++ if_tun.c	8 May 2019 05:15:05 -0000
@@ -1087,7 +1087,6 @@ filt_tunread(struct knote *kn, long hint
 {
 	struct tun_softc	*tp;
 	struct ifnet		*ifp;
-	unsigned int		 len;
 
 	if (kn->kn_status & KN_DETACHED) {
 		kn->kn_data = 0;
@@ -1097,16 +1096,8 @@ filt_tunread(struct knote *kn, long hint
 	tp = (struct tun_softc *)kn->kn_hook;
 	ifp = &tp->tun_if;
 
-	len = IFQ_LEN(&ifp->if_snd);
-	if (len > 0) {
-		kn->kn_data = len;
-
-		TUNDEBUG(("%s: tunkqread q=%d\n", ifp->if_xname,
-		    IFQ_LEN(&ifp->if_snd)));
-		return (1);
-	}
-	TUNDEBUG(("%s: tunkqread waiting\n", ifp->if_xname));
-	return (0);
+	kn->kn_data = ifq_hdatalen(&ifp->if_snd);
+	return (kn->kn_data > 0);
 }
 
 void