Module Name: src
Committed By: yamaguchi
Date: Fri Apr 5 06:16:32 UTC 2024
Modified Files:
src/sys/net/lagg: if_lagg_lacp.c
Log Message:
lagg(4): added check of LACP running state for safety
When LACP stops, the handler of callout do nothing
because all port is already detached from lacp.
Therefore, the added checks are just for safety.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 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.39 src/sys/net/lagg/if_lagg_lacp.c:1.40
--- src/sys/net/lagg/if_lagg_lacp.c:1.39 Fri Apr 5 06:11:16 2024
+++ src/sys/net/lagg/if_lagg_lacp.c Fri Apr 5 06:16:32 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lagg_lacp.c,v 1.39 2024/04/05 06:11:16 yamaguchi Exp $ */
+/* $NetBSD: if_lagg_lacp.c,v 1.40 2024/04/05 06:16:32 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.39 2024/04/05 06:11:16 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg_lacp.c,v 1.40 2024/04/05 06:16:32 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_lagg.h"
@@ -1491,10 +1491,16 @@ lacp_tick(void *xlsc)
lsc = xlsc;
- lagg_workq_add(lsc->lsc_workq, &lsc->lsc_work_tick);
-
LACP_LOCK(lsc);
+
+ if (!lsc->lsc_running) {
+ LACP_UNLOCK(lsc);
+ return;
+ }
+
+ lagg_workq_add(lsc->lsc_workq, &lsc->lsc_work_tick);
callout_schedule(&lsc->lsc_tick, hz);
+
LACP_UNLOCK(lsc);
}
@@ -1548,6 +1554,11 @@ lacp_tick_work(struct lagg_work *lw __un
sc = lsc->lsc_softc;
LACP_LOCK(lsc);
+ if (!lsc->lsc_running) {
+ LACP_UNLOCK(lsc);
+ return;
+ }
+
lacp_run_prototimers(lsc);
LACP_UNLOCK(lsc);
