Module Name: src
Committed By: pooka
Date: Wed Dec 8 20:20:17 UTC 2010
Modified Files:
src/sys/rump/net: Makefile.rumpnetcomp
src/sys/rump/net/lib/libnet/opt: agr.h
Added Files:
src/sys/rump/net/lib/libagr: Makefile component.c shlib_version
Log Message:
agr(4) support
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/net/Makefile.rumpnetcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libagr/Makefile \
src/sys/rump/net/lib/libagr/component.c \
src/sys/rump/net/lib/libagr/shlib_version
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libnet/opt/agr.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/rump/net/Makefile.rumpnetcomp
diff -u src/sys/rump/net/Makefile.rumpnetcomp:1.3 src/sys/rump/net/Makefile.rumpnetcomp:1.4
--- src/sys/rump/net/Makefile.rumpnetcomp:1.3 Wed Dec 8 18:06:43 2010
+++ src/sys/rump/net/Makefile.rumpnetcomp Wed Dec 8 20:20:16 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.rumpnetcomp,v 1.3 2010/12/08 18:06:43 pooka Exp $
+# $NetBSD: Makefile.rumpnetcomp,v 1.4 2010/12/08 20:20:16 pooka Exp $
#
-RUMPNETCOMP= bridge net net80211 netbt netinet local shmif virtif
+RUMPNETCOMP= agr bridge net net80211 netbt netinet local shmif virtif
RUMPNETSOCKIN= sockin
Index: src/sys/rump/net/lib/libnet/opt/agr.h
diff -u src/sys/rump/net/lib/libnet/opt/agr.h:1.1 src/sys/rump/net/lib/libnet/opt/agr.h:1.2
--- src/sys/rump/net/lib/libnet/opt/agr.h:1.1 Mon Oct 6 00:27:06 2008
+++ src/sys/rump/net/lib/libnet/opt/agr.h Wed Dec 8 20:20:17 2010
@@ -1,3 +1,3 @@
-/* $NetBSD: agr.h,v 1.1 2008/10/06 00:27:06 pooka Exp $ */
+/* $NetBSD: agr.h,v 1.2 2010/12/08 20:20:17 pooka Exp $ */
-/* dummy */
+#define NAGR 1
Added files:
Index: src/sys/rump/net/lib/libagr/Makefile
diff -u /dev/null src/sys/rump/net/lib/libagr/Makefile:1.1
--- /dev/null Wed Dec 8 20:20:17 2010
+++ src/sys/rump/net/lib/libagr/Makefile Wed Dec 8 20:20:17 2010
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2010/12/08 20:20:17 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../net/agr
+
+LIB= rumpnet_agr
+
+SRCS= if_agr.c if_agrsoftc.c if_agrsubr.c if_agrtimer.c if_agrmonitor.c \
+ if_agrether.c if_agrether_hash.c ieee8023ad_marker.c ieee8023ad_lacp.c \
+ ieee8023ad_lacp_select.c ieee8023ad_lacp_timer.c \
+ ieee8023ad_lacp_sm_rx.c ieee8023ad_lacp_sm_mux.c \
+ ieee8023ad_lacp_sm_ptx.c ieee8023ad_lacp_sm_tx.c \
+ ieee8023ad_lacp_debug.c ieee8023_tlv.c
+
+SRCS+= component.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/net/lib/libagr/component.c
diff -u /dev/null src/sys/rump/net/lib/libagr/component.c:1.1
--- /dev/null Wed Dec 8 20:20:17 2010
+++ src/sys/rump/net/lib/libagr/component.c Wed Dec 8 20:20:17 2010
@@ -0,0 +1,42 @@
+/* $NetBSD: component.c,v 1.1 2010/12/08 20:20:17 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 Antti Kantee. 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 ``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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2010/12/08 20:20:17 pooka Exp $");
+
+#include <sys/param.h>
+
+#include "rump_private.h"
+#include "rump_net_private.h"
+
+int agrattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
+{
+
+ agrattach(0);
+}
Index: src/sys/rump/net/lib/libagr/shlib_version
diff -u /dev/null src/sys/rump/net/lib/libagr/shlib_version:1.1
--- /dev/null Wed Dec 8 20:20:17 2010
+++ src/sys/rump/net/lib/libagr/shlib_version Wed Dec 8 20:20:17 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/12/08 20:20:17 pooka Exp $
+#
+major=0
+minor=0
