Module Name: src
Committed By: yamaguchi
Date: Mon Apr 26 08:42:19 UTC 2021
Modified Files:
src/sys/net: if_spppsubr.c
Log Message:
Avoid updating of the state if the state is not changed
not to reset the timer for state machine
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/sys/net/if_spppsubr.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_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.224 src/sys/net/if_spppsubr.c:1.225
--- src/sys/net/if_spppsubr.c:1.224 Mon Apr 26 08:37:54 2021
+++ src/sys/net/if_spppsubr.c Mon Apr 26 08:42:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.224 2021/04/26 08:37:54 yamaguchi Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.225 2021/04/26 08:42:19 yamaguchi Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.224 2021/04/26 08:37:54 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.225 2021/04/26 08:42:19 yamaguchi Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -2153,9 +2153,10 @@ sppp_rcr_event(struct sppp *sp, void *xc
cp->scr(sp);
cp->scan(cp, sp);
break;
- case STATE_ACK_SENT:
case STATE_REQ_SENT:
sppp_cp_change_state(cp, sp, STATE_ACK_SENT);
+ /* fall through */
+ case STATE_ACK_SENT:
cp->scan(cp, sp);
break;
case STATE_STOPPED:
@@ -2202,8 +2203,9 @@ sppp_rcr_event(struct sppp *sp, void *xc
cp->scan(cp, sp);
break;
case STATE_ACK_SENT:
- case STATE_REQ_SENT:
sppp_cp_change_state(cp, sp, STATE_REQ_SENT);
+ /* fall through */
+ case STATE_REQ_SENT:
cp->scan(cp, sp);
break;
case STATE_STOPPED:
