Module Name: src
Committed By: yamaguchi
Date: Thu Mar 31 01:36:47 UTC 2022
Modified Files:
src/sys/net/lagg: files.lagg if_lagg_lacp.c
src/sys/rump/include/opt: opt_rumpkernel.h
Log Message:
Added a kernel option to run LACP on a half duplex interface
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/net/lagg/files.lagg
cvs rdiff -u -r1.13 -r1.14 src/sys/net/lagg/if_lagg_lacp.c
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/include/opt/opt_rumpkernel.h
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/files.lagg
diff -u src/sys/net/lagg/files.lagg:1.3 src/sys/net/lagg/files.lagg:1.4
--- src/sys/net/lagg/files.lagg:1.3 Tue Nov 16 04:48:43 2021
+++ src/sys/net/lagg/files.lagg Thu Mar 31 01:36:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.lagg,v 1.3 2021/11/16 04:48:43 yamaguchi Exp $
+# $NetBSD: files.lagg,v 1.4 2022/03/31 01:36:47 yamaguchi Exp $
file net/lagg/if_lagg.c lagg & ether needs-flag
file net/lagg/if_lagg_lacp.c lagg & ether
@@ -6,4 +6,5 @@ file net/lagg/if_laggproto.c lagg
defflag opt_lagg.h LAGG_DEBUG LACP_DEBUG
LACP_STANDBY_SYNCED
+ LACP_NOFDX
defparam opt_lagg.h LAGG_SETCAPS_RETRY
Index: src/sys/net/lagg/if_lagg_lacp.c
diff -u src/sys/net/lagg/if_lagg_lacp.c:1.13 src/sys/net/lagg/if_lagg_lacp.c:1.14
--- src/sys/net/lagg/if_lagg_lacp.c:1.13 Sun Jan 16 10:45:17 2022
+++ src/sys/net/lagg/if_lagg_lacp.c Thu Mar 31 01:36:47 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lagg_lacp.c,v 1.13 2022/01/16 10:45:17 rillig Exp $ */
+/* $NetBSD: if_lagg_lacp.c,v 1.14 2022/03/31 01:36:47 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.13 2022/01/16 10:45:17 rillig Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg_lacp.c,v 1.14 2022/03/31 01:36:47 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_lagg.h"
@@ -867,7 +867,9 @@ lacp_linkstate_ifnet_locked(struct lagg_
}
if (ISSET(media, LACP_MEDIA_ETHER) &&
+#ifndef LACP_NOFDX
ISSET(media, LACP_MEDIA_FDX) &&
+#endif
ifp_port->if_link_state != LINK_STATE_DOWN &&
ISSET(ifp_port->if_flags, IFF_RUNNING)) {
lacp_port_enable(lsc, lacpp);
Index: src/sys/rump/include/opt/opt_rumpkernel.h
diff -u src/sys/rump/include/opt/opt_rumpkernel.h:1.7 src/sys/rump/include/opt/opt_rumpkernel.h:1.8
--- src/sys/rump/include/opt/opt_rumpkernel.h:1.7 Wed Jul 14 03:19:24 2021
+++ src/sys/rump/include/opt/opt_rumpkernel.h Thu Mar 31 01:36:47 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_rumpkernel.h,v 1.7 2021/07/14 03:19:24 ozaki-r Exp $ */
+/* $NetBSD: opt_rumpkernel.h,v 1.8 2022/03/31 01:36:47 yamaguchi Exp $ */
#ifndef __NetBSD__
#define __NetBSD__
@@ -36,3 +36,5 @@
#define ALTQ
#define ALTQ_CBQ
+
+#define LACP_NOFDX
