 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_spppsubr.c,v 1.255 2021/06/01 05:11:22 yamaguchi Exp $	 */
+/*	$NetBSD: if_spppsubr.c,v 1.256 2021/06/01 05:16:46 yamaguchi Exp $	 */
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
+ *
  * Copyright (C) 1994-1996 Cronyx Engineering Ltd.
  * Author: Serge Vakulenko, <vak@cronyx.ru>
+ *
  * Heavily revamped to conform to RFC 1661.
  * Copyright (C) 1997, Joerg Wunsch.
+ *
  * RFC2472 IPv6CP support.
  * Copyright (C) 2000, Jun-ichiro itojun Hagino <itojun@iijlab.net>.
 @@ -31,27 +31,27 @@
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
+ *
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
+ *
  * From: if_spppsubr.c,v 1.39 1998/04/04 13:26:03 phk Exp
+ *
  * From: Id: if_spppsubr.c,v 1.23 1999/02/23 14:47:50 hm Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.255 2021/06/01 05:11:22 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.256 2021/06/01 05:16:46 yamaguchi Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #include "opt_modular.h"
 #include "opt_compat_netbsd.h"
 #include "opt_net_mpsafe.h"
 #include "opt_sppp.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 @@ -1888,26 +1888,27 @@ sppp_open_event(struct sppp *sp, void *x
 	SPPP_DLOG(sp, "%s open(%s)\n", cp->name,
 	    sppp_state_name(sp->scp[cp->protoidx].state));
 	switch (sp->scp[cp->protoidx].state) {
 	case STATE_INITIAL:
 		sppp_cp_change_state(cp, sp, STATE_STARTING);
 		(cp->tls)(cp, sp);
 		break;
 	case STATE_STARTING:
 		break;
 	case STATE_CLOSED:
 		sp->scp[cp->protoidx].rst_counter = sp->lcp.max_configure;
 		sp->lcp.protos |= (1 << cp->protoidx);
 		(cp->scr)(sp);
 		sppp_cp_change_state(cp, sp, STATE_REQ_SENT);
 		break;
 	case STATE_STOPPED:
 	case STATE_STOPPING:
 	case STATE_REQ_SENT:
 	case STATE_ACK_RCVD:
 	case STATE_ACK_SENT:
 	case STATE_OPENED:
 		break;
 	case STATE_CLOSING:
 		sppp_cp_change_state(cp, sp, STATE_STOPPING);
 		break;
 @@ -3104,26 +3105,27 @@ sppp_lcp_confnak(struct sppp *sp, struct
 			break;
+		}
+	}
 	if (debug)
 		addlog("\n");
 end:
 	return;
+}
 static void
 sppp_lcp_tlu(struct sppp *sp)
+{
 	struct ifnet *ifp;
 	struct sppp_cp *scp;
 	int i;
 	bool going_up;
 	KASSERT(SPPP_WLOCKED(sp));
 	ifp = &sp->pp_if;
 	/* unlock for IFNET_LOCK and if_up() */
 	SPPP_UNLOCK(sp);
 	if (! (ifp->if_flags & IFF_UP) &&
 	    (ifp->if_flags & IFF_RUNNING)) {
 		/* Coming out of loopback mode. */
 @@ -3150,57 +3152,60 @@ sppp_lcp_tlu(struct sppp *sp)
 		ifp->if_mtu = sp->lcp.their_mru;
 		SPPP_DLOG(sp, "setting MTU "
 		    "from %"PRIu64" bytes to %"PRIu64" bytes\n",
 		    sp->pp_saved_mtu, ifp->if_mtu);
+	}
 	IFNET_UNLOCK(ifp);
 	if (ISSET(sp->lcp.opts, SPPP_LCP_OPT_AUTH_PROTO) ||
 	    (sp->pp_flags & PP_NEEDAUTH) != 0)
 		sppp_change_phase(sp, SPPP_PHASE_AUTHENTICATE);
 	else
 		sppp_change_phase(sp, SPPP_PHASE_NETWORK);
 	/*
 	 * Open all authentication protocols.  This is even required
 	 * if we already proceeded to network phase, since it might be
 	 * that remote wants us to authenticate, so we might have to
 	 * send a PAP request.  Undesired authentication protocols
 	 * don't do anything when they get an Open event.
 	 */
 	for (i = 0; i < IDX_COUNT; i++)
 		if ((cps[i])->flags & CP_AUTH) {
 			sppp_wq_add(sp->wq_cp,
 			    &sp->scp[(cps[i])->protoidx].work_open);
-	if (sp->pp_phase == SPPP_PHASE_NETWORK) {
+	for (i = 0; i < IDX_COUNT; i++) {
-		/* Notify all NCPs. */
+		scp = &sp->scp[(cps[i])->protoidx];
 		for (i = 0; i < IDX_COUNT; i++)
-			if ((cps[i])->flags & CP_NCP) {
+		if (((cps[i])->flags & CP_LCP) == 0)
-			sppp_wq_add(sp->wq_cp,
+			sppp_wq_add(sp->wq_cp, &scp->work_up);
 			    &sp->scp[(cps[i])->protoidx].work_open);
 		/*
 		 * Open all authentication protocols.  This is even required
 		 * if we already proceeded to network phase, since it might be
 		 * that remote wants us to authenticate, so we might have to
 		 * send a PAP request.  Undesired authentication protocols
 		 * don't do anything when they get an Open event.
 		 */
 		if ((cps[i])->flags & CP_AUTH)
 			sppp_wq_add(sp->wq_cp, &scp->work_open);
 		/* Open all NCPs. */
 		if (sp->pp_phase == SPPP_PHASE_NETWORK &&
 		    ((cps[i])->flags & CP_NCP) != 0) {
 			sppp_wq_add(sp->wq_cp, &scp->work_open);
+		}
+	}
 	/* notify low-level driver of state change */
 	sppp_notify_chg_wlocked(sp);
+}
 static void
 sppp_lcp_tld(struct sppp *sp)
+{
 	struct ifnet *ifp;
-	int i, pi, phase;
+	struct sppp_cp *scp;
 	int i, phase;
 	KASSERT(SPPP_WLOCKED(sp));
 	phase = sp->pp_phase;
 	sppp_change_phase(sp, SPPP_PHASE_TERMINATE);
 	if (sp->pp_saved_mtu > 0) {
 		ifp = &sp->pp_if;
 		SPPP_UNLOCK(sp);
 		IFNET_LOCK(ifp);
 		SPPP_LOCK(sp, RW_WRITER);
 @@ -3211,35 +3216,39 @@ sppp_lcp_tld(struct sppp *sp)
 		ifp->if_mtu = sp->pp_saved_mtu;
 		sp->pp_saved_mtu = 0;
 		IFNET_UNLOCK(ifp);
+	}
 	/*
 	 * Take upper layers down.  We send the Down event first and
 	 * the Close second to prevent the upper layers from sending
 	 * ``a flurry of terminate-request packets'', as the RFC
 	 * describes it.
 	 */
 	for (i = 0; i < IDX_COUNT; i++) {
-		pi = (cps[i])->protoidx;
+		scp = &sp->scp[(cps[i])->protoidx];
 		if (((cps[i])->flags & CP_LCP) == 0) {
 			/* skip if ncp was not started */
 			if (phase != SPPP_PHASE_NETWORK &&
 			    ((cps[i])->flags & CP_NCP) != 0)
 				continue;
-			sppp_wq_add(sp->wq_cp, &sp->scp[pi].work_down);
+		if (((cps[i])->flags & CP_LCP) == 0)
-			sppp_wq_add(sp->wq_cp, &sp->scp[pi].work_close);
+			sppp_wq_add(sp->wq_cp, &scp->work_down);
 		if ((cps[i])->flags & CP_AUTH) {
 			sppp_wq_add(sp->wq_cp, &scp->work_close);
+		}
 		/* Close all NCPs. */
 		if (phase == SPPP_PHASE_NETWORK &&
 		    ((cps[i])->flags & CP_NCP) != 0) {
 			sppp_wq_add(sp->wq_cp, &scp->work_close);
+		}
+	}
+}
 static void
 sppp_lcp_tls(const struct cp *cp __unused, struct sppp *sp)
+{
 	KASSERT(SPPP_WLOCKED(sp));
 	sppp_change_phase(sp, SPPP_PHASE_ESTABLISH);
 	/* Notify lower layer if desired. */
 @@ -6500,31 +6509,30 @@ sppp_dotted_quad(char *buf, size_t bufle
+}
 /* a dummy, used to drop uninteresting events */
 static void
 sppp_null(struct sppp *unused)
+{
 	/* do just nothing */
+}
 static void
 sppp_tls(const struct cp *cp, struct sppp *sp)
+{
 	SPPP_DLOG(sp, "%s tls\n", cp->name);
 	/* notify lcp that is lower layer */
 	sp->lcp.protos |= (1 << cp->protoidx);
 	if (sp->scp[IDX_LCP].state == STATE_OPENED)
 		sppp_wq_add(sp->wq_cp, &sp->scp[cp->protoidx].work_up);
+}
 static void
 sppp_tlf(const struct cp *cp, struct sppp *sp)
+{
 	SPPP_DLOG(sp, "%s tlf\n", cp->name);
 	/* notify lcp that is lower layer */
 	sp->lcp.protos &= ~(1 << cp->protoidx);
 	/* cleanup */
 	if (sp->scp[cp->protoidx].mbuf_confreq != NULL) {