CVS commit: src/sys/net

[Mindaugas Rasiukevicius]

Module Name:    src
Committed By:   rmind
Date:           Sat May 17 14:51:10 UTC 2014

Modified Files:
        src/sys/net: if_ppp.c

Log Message:
ppp_inproc: handle non-IP protocols correctly (hi msaitoh); PR/48813.


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/net/if_ppp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.142 src/sys/net/if_ppp.c:1.143
--- src/sys/net/if_ppp.c:1.142	Thu May 15 09:23:03 2014
+++ src/sys/net/if_ppp.c	Sat May 17 14:51:09 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ppp.c,v 1.142 2014/05/15 09:23:03 msaitoh Exp $	*/
+/*	$NetBSD: if_ppp.c,v 1.143 2014/05/17 14:51:09 rmind Exp $	*/
 /*	Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp 	*/
 
 /*
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.142 2014/05/15 09:23:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.143 2014/05/17 14:51:09 rmind Exp $");
 
 #include "ppp.h"
 
@@ -1676,7 +1676,9 @@ ppp_inproc(struct ppp_softc *sc, struct 
 	goto bad;
     }
     IF_ENQUEUE(inq, m);
-    schednetisr(isr);
+    if (__predict_true(isr)) {
+        schednetisr(isr);
+    }
     splx(s);
     ifp->if_ipackets++;
     ifp->if_ibytes += ilen;