[src/trunk]: src/sys/net stop callout even when the state is in PPPOE_STATE_I...

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

details:   https://anonhg.NetBSD.org/src/rev/e7801700e811
branches:  trunk
changeset: 946393:e7801700e811
user:      yamaguchi <yamaguchi%NetBSD.org@localhost>
date:      Wed Nov 25 10:37:04 2020 +0000

description:
stop callout even when the state is in PPPOE_STATE_INITIAL

diffstat:

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

diffs (26 lines):

diff -r 5f12dc545f9a -r e7801700e811 sys/net/if_pppoe.c
--- a/sys/net/if_pppoe.c        Wed Nov 25 10:35:07 2020 +0000
+++ b/sys/net/if_pppoe.c        Wed Nov 25 10:37:04 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.154 2020/11/25 10:18:49 yamaguchi Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.155 2020/11/25 10:37:04 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.154 2020/11/25 10:18:49 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.155 2020/11/25 10:37:04 yamaguchi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "pppoe.h"
@@ -1317,7 +1317,6 @@
                PPPOE_LOCK(sc, RW_WRITER);
 
                if ((ifr->ifr_flags & IFF_UP) == 0
-                    && sc->sc_state >= PPPOE_STATE_PADI_SENT
                     && sc->sc_state < PPPOE_STATE_SESSION) {
                        callout_stop(&sc->sc_timeout);
                        sc->sc_state = PPPOE_STATE_INITIAL;