[src/trunk]: src/sys/net sppp_input: handle pktqueue case correctly (fix for ...

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4e4969685b0b
branches:  trunk
changeset: 329754:4e4969685b0b
user:      rmind <rmind%NetBSD.org@localhost>
date:      Fri Jun 06 22:15:32 2014 +0000

description:
sppp_input: handle pktqueue case correctly (fix for the previous).

diffstat:

 sys/net/if_spppsubr.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r c5d8d23e3cc8 -r 4e4969685b0b sys/net/if_spppsubr.c
--- a/sys/net/if_spppsubr.c     Fri Jun 06 21:56:39 2014 +0000
+++ b/sys/net/if_spppsubr.c     Fri Jun 06 22:15:32 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_spppsubr.c,v 1.129 2014/06/05 23:48:16 rmind Exp $   */
+/*     $NetBSD: if_spppsubr.c,v 1.130 2014/06/06 22:15:32 rmind Exp $   */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.129 2014/06/05 23:48:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.130 2014/06/06 22:15:32 rmind Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -636,8 +636,9 @@
        }
 
 queue_pkt:
-       if (! (ifp->if_flags & IFF_UP) || ! inq)
+       if ((ifp->if_flags & IFF_UP) == 0 || (!inq && !pktq)) {
                goto drop;
+       }
 
        /* Check queue. */
        if (__predict_true(pktq)) {