Module Name: src
Committed By: yamaguchi
Date: Fri May 14 08:31:15 UTC 2021
Modified Files:
src/sys/conf: files
src/sys/net: if_spppsubr.c
Log Message:
Added SPPP_NORECV_TIME option to change pp_max_noreceive
To generate a diff of this commit:
cvs rdiff -u -r1.1280 -r1.1281 src/sys/conf/files
cvs rdiff -u -r1.239 -r1.240 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/conf/files
diff -u src/sys/conf/files:1.1280 src/sys/conf/files:1.1281
--- src/sys/conf/files:1.1280 Fri May 14 08:06:32 2021
+++ src/sys/conf/files Fri May 14 08:31:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1280 2021/05/14 08:06:32 yamaguchi Exp $
+# $NetBSD: files,v 1.1281 2021/05/14 08:31:14 yamaguchi Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -291,6 +291,7 @@ defflag opt_ppp.h PPP_DEFLATE PPP_BSDCO
defflag opt_pppoe.h PPPOE_SERVER PPPOE_DEBUG
defparam opt_sppp.h SPPP_KEEPALIVE_INTERVAL
+ SPPP_NORECV_TIME
# networking options
#
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.239 src/sys/net/if_spppsubr.c:1.240
--- src/sys/net/if_spppsubr.c:1.239 Fri May 14 08:11:08 2021
+++ src/sys/net/if_spppsubr.c Fri May 14 08:31:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.239 2021/05/14 08:11:08 yamaguchi Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.240 2021/05/14 08:31:14 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.239 2021/05/14 08:11:08 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.240 2021/05/14 08:31:14 yamaguchi Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -107,6 +107,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_spppsubr.
#define SPPP_KEEPALIVE_INTERVAL DEFAULT_KEEPALIVE_INTERVAL
#endif
+#ifndef SPPP_NORECV_TIME
+#define SPPP_NORECV_TIME DEFAULT_NORECV_TIME
+#endif
+
/*
* Interface flags that can be set in an ifconfig command.
*
@@ -1101,7 +1105,7 @@ sppp_attach(struct ifnet *ifp)
sp->pp_last_activity = 0;
sp->pp_last_receive = 0;
sp->pp_maxalive = DEFAULT_MAXALIVECNT;
- sp->pp_max_noreceive = DEFAULT_NORECV_TIME;
+ sp->pp_max_noreceive = SPPP_NORECV_TIME;
sp->pp_idle_timeout = 0;
sp->pp_max_auth_fail = DEFAULT_MAX_AUTH_FAILURES;
sp->pp_phase = SPPP_PHASE_DEAD;
