Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/net Move net/agr/ieee8023_slowprotocols.h to net/ether_s...
details: https://anonhg.NetBSD.org/src/rev/4996834109db
branches: trunk
changeset: 1026571:4996834109db
user: yamaguchi <yamaguchi%NetBSD.org@localhost>
date: Tue Nov 30 01:17:02 2021 +0000
description:
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.
diffstat:
sys/net/agr/ieee8023_slowprotocols.h | 48 ------------------------------------
sys/net/agr/ieee8023ad_lacp.c | 6 ++--
sys/net/agr/ieee8023ad_lacp_debug.c | 6 ++--
sys/net/agr/ieee8023ad_lacp_select.c | 6 ++--
sys/net/agr/ieee8023ad_lacp_sm_mux.c | 6 ++--
sys/net/agr/ieee8023ad_lacp_sm_ptx.c | 6 ++--
sys/net/agr/ieee8023ad_lacp_sm_rx.c | 6 ++--
sys/net/agr/ieee8023ad_lacp_sm_tx.c | 6 ++--
sys/net/agr/ieee8023ad_lacp_timer.c | 6 ++--
sys/net/agr/ieee8023ad_marker.c | 6 ++--
sys/net/agr/if_agrether.c | 6 ++--
sys/net/ether_slowprotocols.h | 46 ++++++++++++++++++++++++++++++++++
sys/net/if_ethersubr.c | 6 ++--
sys/net/lagg/if_lagg_lacp.c | 6 +++-
sys/net/lagg/if_lagg_lacp.h | 10 +------
15 files changed, 84 insertions(+), 92 deletions(-)
diffs (truncated from 468 to 300 lines):
diff -r 57e312d40e73 -r 4996834109db sys/net/agr/ieee8023_slowprotocols.h
--- a/sys/net/agr/ieee8023_slowprotocols.h Mon Nov 29 23:58:06 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/* $NetBSD: ieee8023_slowprotocols.h,v 1.2 2005/12/10 23:21:39 elad 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_AGR_IEEE8023_SLOWPROTOCOLS_H_
-#define _NET_AGR_IEEE8023_SLOWPROTOCOLS_H_
-
-/*
- * IEEE802.3 slow protocols
- *
- * protocol (on-wire) definitions.
- *
- * XXX should be elsewhere.
- */
-
-#define SLOWPROTOCOLS_SUBTYPE_LACP 1
-#define SLOWPROTOCOLS_SUBTYPE_MARKER 2
-
-struct slowprothdr {
- uint8_t sph_subtype;
- uint8_t sph_version;
-} __packed;
-
-#endif /* !_NET_AGR_IEEE8023_SLOWPROTOCOLS_H_ */
diff -r 57e312d40e73 -r 4996834109db sys/net/agr/ieee8023ad_lacp.c
--- a/sys/net/agr/ieee8023ad_lacp.c Mon Nov 29 23:58:06 2021 +0000
+++ b/sys/net/agr/ieee8023ad_lacp.c Tue Nov 30 01:17:02 2021 +0000
@@ -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 @@
#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>
diff -r 57e312d40e73 -r 4996834109db sys/net/agr/ieee8023ad_lacp_debug.c
--- a/sys/net/agr/ieee8023ad_lacp_debug.c Mon Nov 29 23:58:06 2021 +0000
+++ b/sys/net/agr/ieee8023ad_lacp_debug.c Tue Nov 30 01:17:02 2021 +0000
@@ -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 @@
#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>
diff -r 57e312d40e73 -r 4996834109db sys/net/agr/ieee8023ad_lacp_select.c
--- a/sys/net/agr/ieee8023ad_lacp_select.c Mon Nov 29 23:58:06 2021 +0000
+++ b/sys/net/agr/ieee8023ad_lacp_select.c Tue Nov 30 01:17:02 2021 +0000
@@ -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 @@
#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>
diff -r 57e312d40e73 -r 4996834109db sys/net/agr/ieee8023ad_lacp_sm_mux.c
--- a/sys/net/agr/ieee8023ad_lacp_sm_mux.c Mon Nov 29 23:58:06 2021 +0000
+++ b/sys/net/agr/ieee8023ad_lacp_sm_mux.c Tue Nov 30 01:17:02 2021 +0000
@@ -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 @@
#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>
diff -r 57e312d40e73 -r 4996834109db sys/net/agr/ieee8023ad_lacp_sm_ptx.c
--- a/sys/net/agr/ieee8023ad_lacp_sm_ptx.c Mon Nov 29 23:58:06 2021 +0000
+++ b/sys/net/agr/ieee8023ad_lacp_sm_ptx.c Tue Nov 30 01:17:02 2021 +0000
@@ -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 @@
#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>
diff -r 57e312d40e73 -r 4996834109db sys/net/agr/ieee8023ad_lacp_sm_rx.c
--- a/sys/net/agr/ieee8023ad_lacp_sm_rx.c Mon Nov 29 23:58:06 2021 +0000
+++ b/sys/net/agr/ieee8023ad_lacp_sm_rx.c Tue Nov 30 01:17:02 2021 +0000
@@ -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 @@
#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>
diff -r 57e312d40e73 -r 4996834109db sys/net/agr/ieee8023ad_lacp_sm_tx.c
--- a/sys/net/agr/ieee8023ad_lacp_sm_tx.c Mon Nov 29 23:58:06 2021 +0000
+++ b/sys/net/agr/ieee8023ad_lacp_sm_tx.c Tue Nov 30 01:17:02 2021 +0000
@@ -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 @@
#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>
diff -r 57e312d40e73 -r 4996834109db sys/net/agr/ieee8023ad_lacp_timer.c
--- a/sys/net/agr/ieee8023ad_lacp_timer.c Mon Nov 29 23:58:06 2021 +0000
+++ b/sys/net/agr/ieee8023ad_lacp_timer.c Tue Nov 30 01:17:02 2021 +0000
@@ -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 @@
#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>
diff -r 57e312d40e73 -r 4996834109db sys/net/agr/ieee8023ad_marker.c
--- a/sys/net/agr/ieee8023ad_marker.c Mon Nov 29 23:58:06 2021 +0000
+++ b/sys/net/agr/ieee8023ad_marker.c Tue Nov 30 01:17:02 2021 +0000
@@ -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 @@
#include <net/if.h>
Home |
Main Index |
Thread Index |
Old Index