Module Name: src
Committed By: yamaguchi
Date: Fri May 14 08:11:08 UTC 2021
Modified Files:
src/sys/net: if_spppsubr.c
Log Message:
Send echo request even while user data is received
if pp_max_noreceive is 0
To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 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.238 src/sys/net/if_spppsubr.c:1.239
--- src/sys/net/if_spppsubr.c:1.238 Fri May 14 08:06:32 2021
+++ src/sys/net/if_spppsubr.c Fri May 14 08:11:08 2021
@@ -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;
