Module Name: src
Committed By: rmind
Date: Fri Jun 6 22:15:32 UTC 2014
Modified Files:
src/sys/net: if_spppsubr.c
Log Message:
sppp_input: handle pktqueue case correctly (fix for the previous).
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/net/if_spppsubr.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_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.129 src/sys/net/if_spppsubr.c:1.130
--- src/sys/net/if_spppsubr.c:1.129 Thu Jun 5 23:48:16 2014
+++ src/sys/net/if_spppsubr.c Fri Jun 6 22:15:32 2014
@@ -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 @@ sppp_input(struct ifnet *ifp, struct mbu
}
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)) {
