[src/trunk]: src/sys/net Change reconnect delay after PADT received (15 sec -...

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

details:   https://anonhg.NetBSD.org/src/rev/15b5046a7508
branches:  trunk
changeset: 1021158:15b5046a7508
user:      yamaguchi <yamaguchi%NetBSD.org@localhost>
date:      Thu May 13 03:28:36 2021 +0000

description:
Change reconnect delay after PADT received (15 sec -> 5 sec)

5 sec is the same as minimum PADI resending interval

diffstat:

 sys/net/if_pppoe.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 869d05b5eef7 -r 15b5046a7508 sys/net/if_pppoe.c
--- a/sys/net/if_pppoe.c        Thu May 13 01:01:10 2021 +0000
+++ b/sys/net/if_pppoe.c        Thu May 13 03:28:36 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.171 2021/05/13 01:01:10 yamaguchi Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.172 2021/05/13 03:28:36 yamaguchi Exp $ */
 
 /*
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.171 2021/05/13 01:01:10 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.172 2021/05/13 03:28:36 yamaguchi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "pppoe.h"
@@ -129,6 +129,7 @@
 #define        PPPOE_SLOW_RETRY        (hz*60) /* persistent retry interval */
 #define        PPPOE_RECON_FAST        (hz*15) /* first retry after auth failure */
 #define        PPPOE_RECON_IMMEDIATE   (hz/10) /* "no delay" reconnect */
+#define        PPPOE_RECON_PADTRCVD    (hz*5)  /* reconnect delay after PADT received */
 #define        PPPOE_DISC_MAXPADI      4       /* retry PADI four times (quickly) */
 #define        PPPOE_DISC_MAXPADR      2       /* retry PADR twice */
 
@@ -1029,8 +1030,11 @@
                        goto done;
 
                pppoe_clear_softc(sc, "received PADT");
-               if (sc->sc_sppp.pp_if.if_flags & IFF_RUNNING)
-                       callout_schedule(&sc->sc_timeout, PPPOE_RECON_FAST);
+               if (sc->sc_sppp.pp_if.if_flags & IFF_RUNNING) {
+                       pppoe_printf(sc, "wait for reconnect\n");
+                       callout_schedule(&sc->sc_timeout,
+                           PPPOE_RECON_PADTRCVD);
+               }
                PPPOE_UNLOCK(sc);
                break;