Module Name: src
Committed By: yamaguchi
Date: Tue Apr 13 05:00:06 UTC 2021
Modified Files:
src/sys/net: if_pppoe.c
Log Message:
Added missing counter clear when a pppoe state changes to PADI_SENT
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/net/if_pppoe.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_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.160 src/sys/net/if_pppoe.c:1.161
--- src/sys/net/if_pppoe.c:1.160 Tue Apr 13 04:57:15 2021
+++ src/sys/net/if_pppoe.c Tue Apr 13 05:00:06 2021
@@ -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)
