Module Name: src
Committed By: yamaguchi
Date: Wed Nov 22 03:27:00 UTC 2023
Modified Files:
src/sys/net/lagg: if_lagg_lacp.c
Log Message:
Update sending interval when the partner's state is changed
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/net/lagg/if_lagg_lacp.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/lagg/if_lagg_lacp.c
diff -u src/sys/net/lagg/if_lagg_lacp.c:1.26 src/sys/net/lagg/if_lagg_lacp.c:1.27
--- src/sys/net/lagg/if_lagg_lacp.c:1.26 Wed Nov 22 03:23:54 2023
+++ src/sys/net/lagg/if_lagg_lacp.c Wed Nov 22 03:27:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lagg_lacp.c,v 1.26 2023/11/22 03:23:54 yamaguchi Exp $ */
+/* $NetBSD: if_lagg_lacp.c,v 1.27 2023/11/22 03:27:00 yamaguchi Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-NetBSD
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lagg_lacp.c,v 1.26 2023/11/22 03:23:54 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg_lacp.c,v 1.27 2023/11/22 03:27:00 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_lagg.h"
@@ -1689,6 +1689,8 @@ lacp_sm_rx_record_default(struct lacp_so
LACP_STATE_STR(pi->lpi_state, buf, sizeof(buf));
LACP_DPRINTF((lsc, lacpp, "newpstate %s\n", buf));
}
+
+ lacp_sm_ptx_update_timeout(lacpp, oldpstate);
}
static inline bool
@@ -1764,12 +1766,17 @@ lacp_sm_rx_record_peerinfo(struct lacp_s
static void
lacp_sm_rx_set_expired(struct lacp_port *lacpp)
{
+ uint8_t oldpstate;
+
+ oldpstate = lacpp->lp_partner.lpi_state;
CLR(lacpp->lp_partner.lpi_state, LACP_STATE_SYNC);
SET(lacpp->lp_partner.lpi_state, LACP_STATE_TIMEOUT);
LACP_TIMER_ARM(lacpp, LACP_TIMER_CURRENT_WHILE,
LACP_SHORT_TIMEOUT_TIME);
SET(lacpp->lp_actor.lpi_state, LACP_STATE_EXPIRED);
+
+ lacp_sm_ptx_update_timeout(lacpp, oldpstate);
}
static void
