[src/trunk]: src/sys/net Send echo request even while user data is received

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

details:   https://anonhg.NetBSD.org/src/rev/cfe46c708741
branches:  trunk
changeset: 379143:cfe46c708741
user:      yamaguchi <yamaguchi%NetBSD.org@localhost>
date:      Fri May 14 08:11:08 2021 +0000

description:
Send echo request even while user data is received
if pp_max_noreceive is 0

diffstat:

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

diffs (28 lines):

diff -r 78b1d633d678 -r cfe46c708741 sys/net/if_spppsubr.c
--- a/sys/net/if_spppsubr.c     Fri May 14 08:06:32 2021 +0000
+++ b/sys/net/if_spppsubr.c     Fri May 14 08:11:08 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_spppsubr.c,v 1.238 2021/05/14 08:06:32 yamaguchi Exp $       */
+/*     $NetBSD: if_spppsubr.c,v 1.239 2021/05/14 08:11:08 yamaguchi Exp $       */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.238 2021/05/14 08:06:32 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.239 2021/05/14 08:11:08 yamaguchi Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -5626,7 +5626,8 @@ sppp_keepalive(void *dummy)
                }
 
                /* No echo reply, but maybe user data passed through? */
-               if ((now - sp->pp_last_receive) < sp->pp_max_noreceive) {
+               if (sp->pp_max_noreceive != 0 &&
+                   (now - sp->pp_last_receive) < sp->pp_max_noreceive) {
                        sp->pp_alivecnt = 0;
                        SPPP_UNLOCK(sp);
                        continue;