Module Name: src
Committed By: yamaguchi
Date: Tue Nov 30 01:17:02 UTC 2021
Modified Files:
src/sys/net: if_ethersubr.c
src/sys/net/agr: ieee8023ad_lacp.c ieee8023ad_lacp_debug.c
ieee8023ad_lacp_select.c ieee8023ad_lacp_sm_mux.c
ieee8023ad_lacp_sm_ptx.c ieee8023ad_lacp_sm_rx.c
ieee8023ad_lacp_sm_tx.c ieee8023ad_lacp_timer.c ieee8023ad_marker.c
if_agrether.c
src/sys/net/lagg: if_lagg_lacp.c if_lagg_lacp.h
Added Files:
src/sys/net: ether_slowprotocols.h
Removed Files:
src/sys/net/agr: ieee8023_slowprotocols.h
Log Message:
Move net/agr/ieee8023_slowprotocols.h to net/ether_slowprotocols.h
Definitions related to slowprotocols are duplicated between
agr/ieee8023ad_slowprotocols.h and lagg/if_lagg_lacp.h
Therefore, the contents are moved to added file.
Note: currently, there are just LACP and Marker protocol,
however slowprotocols is independent of them.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/net/ether_slowprotocols.h
cvs rdiff -u -r1.305 -r1.306 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.2 -r0 src/sys/net/agr/ieee8023_slowprotocols.h
cvs rdiff -u -r1.12 -r1.13 src/sys/net/agr/ieee8023ad_lacp.c
cvs rdiff -u -r1.6 -r1.7 src/sys/net/agr/ieee8023ad_lacp_debug.c
cvs rdiff -u -r1.5 -r1.6 src/sys/net/agr/ieee8023ad_lacp_select.c \
src/sys/net/agr/ieee8023ad_lacp_timer.c \
src/sys/net/agr/ieee8023ad_marker.c
cvs rdiff -u -r1.4 -r1.5 src/sys/net/agr/ieee8023ad_lacp_sm_mux.c \
src/sys/net/agr/ieee8023ad_lacp_sm_rx.c \
src/sys/net/agr/ieee8023ad_lacp_sm_tx.c
cvs rdiff -u -r1.3 -r1.4 src/sys/net/agr/ieee8023ad_lacp_sm_ptx.c
cvs rdiff -u -r1.11 -r1.12 src/sys/net/agr/if_agrether.c
cvs rdiff -u -r1.8 -r1.9 src/sys/net/lagg/if_lagg_lacp.c
cvs rdiff -u -r1.2 -r1.3 src/sys/net/lagg/if_lagg_lacp.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/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.305 src/sys/net/if_ethersubr.c:1.306
--- src/sys/net/if_ethersubr.c:1.305 Thu Nov 25 00:49:34 2021
+++ src/sys/net/if_ethersubr.c Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.305 2021/11/25 00:49:34 msaitoh Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.306 2021/11/30 01:17:02 yamaguchi Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.305 2021/11/25 00:49:34 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.306 2021/11/30 01:17:02 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -120,7 +120,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ethersubr
#endif
#if NAGR > 0
-#include <net/agr/ieee8023_slowprotocols.h> /* XXX */
+#include <net/ether_slowprotocols.h>
#include <net/agr/ieee8023ad.h>
#include <net/agr/if_agrvar.h>
#endif
Index: src/sys/net/agr/ieee8023ad_lacp.c
diff -u src/sys/net/agr/ieee8023ad_lacp.c:1.12 src/sys/net/agr/ieee8023ad_lacp.c:1.13
--- src/sys/net/agr/ieee8023ad_lacp.c:1.12 Thu Sep 30 03:15:25 2021
+++ src/sys/net/agr/ieee8023ad_lacp.c Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee8023ad_lacp.c,v 1.12 2021/09/30 03:15:25 yamaguchi Exp $ */
+/* $NetBSD: ieee8023ad_lacp.c,v 1.13 2021/11/30 01:17:02 yamaguchi Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp.c,v 1.12 2021/09/30 03:15:25 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp.c,v 1.13 2021/11/30 01:17:02 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -40,10 +40,10 @@ __KERNEL_RCSID(0, "$NetBSD: ieee8023ad_l
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/ether_slowprotocols.h>
#include <net/agr/if_agrvar_impl.h>
#include <net/agr/if_agrsubr.h>
-#include <net/agr/ieee8023_slowprotocols.h>
#include <net/agr/ieee8023_tlv.h>
#include <net/agr/ieee8023ad.h>
#include <net/agr/ieee8023ad_lacp.h>
Index: src/sys/net/agr/ieee8023ad_lacp_debug.c
diff -u src/sys/net/agr/ieee8023ad_lacp_debug.c:1.6 src/sys/net/agr/ieee8023ad_lacp_debug.c:1.7
--- src/sys/net/agr/ieee8023ad_lacp_debug.c:1.6 Sun Jul 17 20:54:52 2011
+++ src/sys/net/agr/ieee8023ad_lacp_debug.c Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee8023ad_lacp_debug.c,v 1.6 2011/07/17 20:54:52 joerg Exp $ */
+/* $NetBSD: ieee8023ad_lacp_debug.c,v 1.7 2021/11/30 01:17:02 yamaguchi Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_debug.c,v 1.6 2011/07/17 20:54:52 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_debug.c,v 1.7 2021/11/30 01:17:02 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -35,8 +35,8 @@ __KERNEL_RCSID(0, "$NetBSD: ieee8023ad_l
#include <net/if.h>
#include <net/if_ether.h>
+#include <net/ether_slowprotocols.h>
-#include <net/agr/ieee8023_slowprotocols.h>
#include <net/agr/ieee8023_tlv.h>
#include <net/agr/ieee8023ad_lacp.h>
#include <net/agr/ieee8023ad_lacp_impl.h>
Index: src/sys/net/agr/ieee8023ad_lacp_select.c
diff -u src/sys/net/agr/ieee8023ad_lacp_select.c:1.5 src/sys/net/agr/ieee8023ad_lacp_select.c:1.6
--- src/sys/net/agr/ieee8023ad_lacp_select.c:1.5 Thu Feb 22 06:20:16 2007
+++ src/sys/net/agr/ieee8023ad_lacp_select.c Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee8023ad_lacp_select.c,v 1.5 2007/02/22 06:20:16 thorpej Exp $ */
+/* $NetBSD: ieee8023ad_lacp_select.c,v 1.6 2021/11/30 01:17:02 yamaguchi Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_select.c,v 1.5 2007/02/22 06:20:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_select.c,v 1.6 2021/11/30 01:17:02 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -36,9 +36,9 @@ __KERNEL_RCSID(0, "$NetBSD: ieee8023ad_l
#include <net/if.h>
#include <net/if_ether.h>
+#include <net/ether_slowprotocols.h>
#include <net/agr/if_agrvar_impl.h>
-#include <net/agr/ieee8023_slowprotocols.h>
#include <net/agr/ieee8023_tlv.h>
#include <net/agr/ieee8023ad_lacp.h>
#include <net/agr/ieee8023ad_lacp_impl.h>
Index: src/sys/net/agr/ieee8023ad_lacp_timer.c
diff -u src/sys/net/agr/ieee8023ad_lacp_timer.c:1.5 src/sys/net/agr/ieee8023ad_lacp_timer.c:1.6
--- src/sys/net/agr/ieee8023ad_lacp_timer.c:1.5 Sun Oct 22 03:39:43 2006
+++ src/sys/net/agr/ieee8023ad_lacp_timer.c Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee8023ad_lacp_timer.c,v 1.5 2006/10/22 03:39:43 uebayasi Exp $ */
+/* $NetBSD: ieee8023ad_lacp_timer.c,v 1.6 2021/11/30 01:17:02 yamaguchi Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_timer.c,v 1.5 2006/10/22 03:39:43 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_timer.c,v 1.6 2021/11/30 01:17:02 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -35,8 +35,8 @@ __KERNEL_RCSID(0, "$NetBSD: ieee8023ad_l
#include <net/if.h>
#include <net/if_ether.h>
+#include <net/ether_slowprotocols.h>
-#include <net/agr/ieee8023_slowprotocols.h>
#include <net/agr/ieee8023_tlv.h>
#include <net/agr/ieee8023ad_lacp.h>
#include <net/agr/ieee8023ad_lacp_impl.h>
Index: src/sys/net/agr/ieee8023ad_marker.c
diff -u src/sys/net/agr/ieee8023ad_marker.c:1.5 src/sys/net/agr/ieee8023ad_marker.c:1.6
--- src/sys/net/agr/ieee8023ad_marker.c:1.5 Thu Sep 30 03:15:25 2021
+++ src/sys/net/agr/ieee8023ad_marker.c Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee8023ad_marker.c,v 1.5 2021/09/30 03:15:25 yamaguchi Exp $ */
+/* $NetBSD: ieee8023ad_marker.c,v 1.6 2021/11/30 01:17:02 yamaguchi Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_marker.c,v 1.5 2021/09/30 03:15:25 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_marker.c,v 1.6 2021/11/30 01:17:02 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -36,9 +36,9 @@ __KERNEL_RCSID(0, "$NetBSD: ieee8023ad_m
#include <net/if.h>
#include <net/if_ether.h>
+#include <net/ether_slowprotocols.h>
#include <net/agr/if_agrvar_impl.h>
-#include <net/agr/ieee8023_slowprotocols.h>
#include <net/agr/ieee8023_tlv.h>
#include <net/agr/ieee8023ad.h>
#include <net/agr/ieee8023ad_marker.h>
Index: src/sys/net/agr/ieee8023ad_lacp_sm_mux.c
diff -u src/sys/net/agr/ieee8023ad_lacp_sm_mux.c:1.4 src/sys/net/agr/ieee8023ad_lacp_sm_mux.c:1.5
--- src/sys/net/agr/ieee8023ad_lacp_sm_mux.c:1.4 Wed Feb 21 23:00:07 2007
+++ src/sys/net/agr/ieee8023ad_lacp_sm_mux.c Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee8023ad_lacp_sm_mux.c,v 1.4 2007/02/21 23:00:07 thorpej Exp $ */
+/* $NetBSD: ieee8023ad_lacp_sm_mux.c,v 1.5 2021/11/30 01:17:02 yamaguchi Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_sm_mux.c,v 1.4 2007/02/21 23:00:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_sm_mux.c,v 1.5 2021/11/30 01:17:02 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -36,8 +36,8 @@ __KERNEL_RCSID(0, "$NetBSD: ieee8023ad_l
#include <net/if.h>
#include <net/if_ether.h>
+#include <net/ether_slowprotocols.h>
-#include <net/agr/ieee8023_slowprotocols.h>
#include <net/agr/ieee8023_tlv.h>
#include <net/agr/ieee8023ad_lacp.h>
#include <net/agr/ieee8023ad_lacp_impl.h>
Index: src/sys/net/agr/ieee8023ad_lacp_sm_rx.c
diff -u src/sys/net/agr/ieee8023ad_lacp_sm_rx.c:1.4 src/sys/net/agr/ieee8023ad_lacp_sm_rx.c:1.5
--- src/sys/net/agr/ieee8023ad_lacp_sm_rx.c:1.4 Wed Feb 21 23:00:07 2007
+++ src/sys/net/agr/ieee8023ad_lacp_sm_rx.c Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee8023ad_lacp_sm_rx.c,v 1.4 2007/02/21 23:00:07 thorpej Exp $ */
+/* $NetBSD: ieee8023ad_lacp_sm_rx.c,v 1.5 2021/11/30 01:17:02 yamaguchi Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_sm_rx.c,v 1.4 2007/02/21 23:00:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_sm_rx.c,v 1.5 2021/11/30 01:17:02 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -36,8 +36,8 @@ __KERNEL_RCSID(0, "$NetBSD: ieee8023ad_l
#include <net/if.h>
#include <net/if_ether.h>
+#include <net/ether_slowprotocols.h>
-#include <net/agr/ieee8023_slowprotocols.h>
#include <net/agr/ieee8023_tlv.h>
#include <net/agr/ieee8023ad_lacp.h>
#include <net/agr/ieee8023ad_lacp_impl.h>
Index: src/sys/net/agr/ieee8023ad_lacp_sm_tx.c
diff -u src/sys/net/agr/ieee8023ad_lacp_sm_tx.c:1.4 src/sys/net/agr/ieee8023ad_lacp_sm_tx.c:1.5
--- src/sys/net/agr/ieee8023ad_lacp_sm_tx.c:1.4 Fri May 15 19:28:10 2020
+++ src/sys/net/agr/ieee8023ad_lacp_sm_tx.c Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee8023ad_lacp_sm_tx.c,v 1.4 2020/05/15 19:28:10 maxv Exp $ */
+/* $NetBSD: ieee8023ad_lacp_sm_tx.c,v 1.5 2021/11/30 01:17:02 yamaguchi Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_sm_tx.c,v 1.4 2020/05/15 19:28:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_sm_tx.c,v 1.5 2021/11/30 01:17:02 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -37,8 +37,8 @@ __KERNEL_RCSID(0, "$NetBSD: ieee8023ad_l
#include <net/if.h>
#include <net/if_ether.h>
+#include <net/ether_slowprotocols.h>
-#include <net/agr/ieee8023_slowprotocols.h>
#include <net/agr/ieee8023_tlv.h>
#include <net/agr/ieee8023ad_lacp.h>
#include <net/agr/ieee8023ad_lacp_impl.h>
Index: src/sys/net/agr/ieee8023ad_lacp_sm_ptx.c
diff -u src/sys/net/agr/ieee8023ad_lacp_sm_ptx.c:1.3 src/sys/net/agr/ieee8023ad_lacp_sm_ptx.c:1.4
--- src/sys/net/agr/ieee8023ad_lacp_sm_ptx.c:1.3 Sun Dec 11 12:24:54 2005
+++ src/sys/net/agr/ieee8023ad_lacp_sm_ptx.c Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee8023ad_lacp_sm_ptx.c,v 1.3 2005/12/11 12:24:54 christos Exp $ */
+/* $NetBSD: ieee8023ad_lacp_sm_ptx.c,v 1.4 2021/11/30 01:17:02 yamaguchi Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_sm_ptx.c,v 1.3 2005/12/11 12:24:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_sm_ptx.c,v 1.4 2021/11/30 01:17:02 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -36,8 +36,8 @@ __KERNEL_RCSID(0, "$NetBSD: ieee8023ad_l
#include <net/if.h>
#include <net/if_ether.h>
+#include <net/ether_slowprotocols.h>
-#include <net/agr/ieee8023_slowprotocols.h>
#include <net/agr/ieee8023_tlv.h>
#include <net/agr/ieee8023ad_lacp.h>
#include <net/agr/ieee8023ad_lacp_impl.h>
Index: src/sys/net/agr/if_agrether.c
diff -u src/sys/net/agr/if_agrether.c:1.11 src/sys/net/agr/if_agrether.c:1.12
--- src/sys/net/agr/if_agrether.c:1.11 Sun Nov 10 21:16:38 2019
+++ src/sys/net/agr/if_agrether.c Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_agrether.c,v 1.11 2019/11/10 21:16:38 chs Exp $ */
+/* $NetBSD: if_agrether.c,v 1.12 2021/11/30 01:17:02 yamaguchi Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_agrether.c,v 1.11 2019/11/10 21:16:38 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_agrether.c,v 1.12 2021/11/30 01:17:02 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -38,12 +38,12 @@ __KERNEL_RCSID(0, "$NetBSD: if_agrether.
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/ether_slowprotocols.h>
#include <net/agr/if_agrvar_impl.h>
#include <net/agr/if_agrethervar.h>
#include <net/agr/if_agrsubr.h>
-#include <net/agr/ieee8023_slowprotocols.h>
#include <net/agr/ieee8023_tlv.h>
#include <net/agr/ieee8023ad.h>
#include <net/agr/ieee8023ad_lacp.h>
Index: src/sys/net/lagg/if_lagg_lacp.c
diff -u src/sys/net/lagg/if_lagg_lacp.c:1.8 src/sys/net/lagg/if_lagg_lacp.c:1.9
--- src/sys/net/lagg/if_lagg_lacp.c:1.8 Tue Nov 16 04:48:43 2021
+++ src/sys/net/lagg/if_lagg_lacp.c Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lagg_lacp.c,v 1.8 2021/11/16 04:48:43 yamaguchi Exp $ */
+/* $NetBSD: if_lagg_lacp.c,v 1.9 2021/11/30 01:17:02 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.8 2021/11/16 04:48:43 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg_lacp.c,v 1.9 2021/11/30 01:17:02 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_lagg.h"
@@ -52,6 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_lagg_lacp
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <net/ether_slowprotocols.h>
+
#include <net/lagg/if_lagg.h>
#include <net/lagg/if_laggproto.h>
#include <net/lagg/if_lagg_lacp.h>
Index: src/sys/net/lagg/if_lagg_lacp.h
diff -u src/sys/net/lagg/if_lagg_lacp.h:1.2 src/sys/net/lagg/if_lagg_lacp.h:1.3
--- src/sys/net/lagg/if_lagg_lacp.h:1.2 Mon May 24 06:08:28 2021
+++ src/sys/net/lagg/if_lagg_lacp.h Tue Nov 30 01:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lagg_lacp.h,v 1.2 2021/05/24 06:08:28 yamaguchi Exp $ */
+/* $NetBSD: if_lagg_lacp.h,v 1.3 2021/11/30 01:17:02 yamaguchi Exp $ */
/*
* Copyright (c) 2021 Internet Initiative Japan Inc.
@@ -48,14 +48,6 @@
LACP_STATE_DISTRIBUTING)
#define LACP_PARTNER_ADMIN_STRICT 0
-#define SLOWPROTOCOLS_SUBTYPE_LACP 1
-#define SLOWPROTOCOLS_SUBTYPE_MARKER 2
-
-struct slowprothdr {
- uint8_t sph_subtype;
- uint8_t sph_version;
-} __packed;
-
#define TLV_TYPE_TERMINATE 0
#define LACP_TYPE_TERMINATE TLV_TYPE_TERMINATE
Added files:
Index: src/sys/net/ether_slowprotocols.h
diff -u /dev/null src/sys/net/ether_slowprotocols.h:1.1
--- /dev/null Tue Nov 30 01:17:03 2021
+++ src/sys/net/ether_slowprotocols.h Tue Nov 30 01:17:02 2021
@@ -0,0 +1,46 @@
+/* $NetBSD: ether_slowprotocols.h,v 1.1 2021/11/30 01:17:02 yamaguchi Exp $ */
+
+/*-
+ * Copyright (c)2005 YAMAMOTO Takashi,
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 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.
+ */
+
+#ifndef _NET_ETHER_SLOWPROTOCOLS_H_
+#define _NET_ETHER_SLOWPROTOCOLS_H_
+
+/*
+ * IEEE802.3 slow protocols
+ *
+ * protocol (on-wire) definitions.
+ */
+
+#define SLOWPROTOCOLS_SUBTYPE_LACP 1
+#define SLOWPROTOCOLS_SUBTYPE_MARKER 2
+
+struct slowprothdr {
+ uint8_t sph_subtype;
+ uint8_t sph_version;
+} __packed;
+
+#endif /* !_NET_ETHER_SLOWPROTOCOLS_H_ */
