Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net Added missing counter clear when a pppoe state chang...



details:   https://anonhg.NetBSD.org/src/rev/702c7693f5e2
branches:  trunk
changeset: 378441:702c7693f5e2
user:      yamaguchi <yamaguchi%NetBSD.org@localhost>
date:      Tue Apr 13 05:00:06 2021 +0000

description:
Added missing counter clear when a pppoe state changes to PADI_SENT

diffstat:

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

diffs (34 lines):

diff -r 22458df11cac -r 702c7693f5e2 sys/net/if_pppoe.c
--- a/sys/net/if_pppoe.c        Tue Apr 13 04:58:59 2021 +0000
+++ b/sys/net/if_pppoe.c        Tue Apr 13 05:00:06 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.160 2021/04/13 04:57:15 yamaguchi Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.161 2021/04/13 05:00:06 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.160 2021/04/13 04:57:15 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.161 2021/04/13 05:00:06 yamaguchi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "pppoe.h"
@@ -1547,6 +1547,7 @@ pppoe_timeout(struct pppoe_softc *sc)
                        memcpy(&sc->sc_dest, etherbroadcastaddr,
                            sizeof(sc->sc_dest));
                        sc->sc_state = PPPOE_STATE_PADI_SENT;
+                       sc->sc_padi_retried = 0;
                        sc->sc_padr_retried = 0;
                        if ((err = pppoe_send_padi(sc)) != 0) {
                                pppoe_printf(sc,
@@ -1596,6 +1597,7 @@ pppoe_connect(struct pppoe_softc *sc)
        ACQUIRE_SPLNET();
        /* save state, in case we fail to send PADI */
        sc->sc_state = PPPOE_STATE_PADI_SENT;
+       sc->sc_padi_retried = 0;
        sc->sc_padr_retried = 0;
        err = pppoe_send_padi(sc);
        if (err != 0)



Home | Main Index | Thread Index | Old Index