initial import of a trunking (link aggregation and link failover)

implementation. it currently supports round robin mode with link state
checking, additional modes will be added later.

ok brad@, deraadt@

2 files changed, 78 insertions, 2 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 2434aa4ebcf..2a947f89dec 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.297 2005/05/13 22:46:51 miod Exp $
+#	$OpenBSD: Makefile,v 1.298 2005/05/24 02:45:18 reyk Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 addcom.4 adv.4 aha.4 ahb.4 ahc.4 ahd.4 \
 	aic.4 amdpm.4 ami.4 amphy.4 an.4 aria.4 ast.4 atalk.4 \
@@ -28,7 +28,7 @@ MAN=	aac.4 ac97.4 acphy.4 addcom.4 adv.4 aha.4 ahb.4 ahc.4 ahd.4 \
 	sf2r.4 sfr.4 siop.4 sis.4 sk.4 sl.4 sm.4 speaker.4 spp.4 sppp.4 \
 	sqphy.4 ss.4 st.4 ste.4 stge.4 sti.4 stp.4 sv.4 \
 	systrace.4 tb.4 tcic.4 tcp.4 termios.4 ti.4 tl.4 \
-	tlphy.4 tqphy.4 trm.4 tty.4 tun.4 twe.4 txp.4 \
+	tlphy.4 tqphy.4 trm.4 trunk.4 tty.4 tun.4 twe.4 txp.4 \
 	txphy.4 uaudio.4 ubsa.4 ubsec.4 ubt.4 ucom.4 udav.4 udp.4 udsbr.4 \
 	ueagle.4 uftdi.4 ugen.4 uhci.4 uhid.4 uhidev.4 uk.4 ukbd.4 \
 	ukphy.4 ulpt.4 umass.4 umct.4 umidi.4 umodem.4 ums.4 \
diff --git a/share/man/man4/trunk.4 b/share/man/man4/trunk.4
new file mode 100644
index 00000000000..31ff68e9196
--- /dev/null
+++ b/share/man/man4/trunk.4
@@ -0,0 +1,76 @@
+.\"	$OpenBSD: trunk.4,v 1.1 2005/05/24 02:45:18 reyk Exp $
+.\"
+.\" Copyright (c) 2005 Reyk Floeter <reyk@vantronix.net>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd May 5, 2005
+.Dt TRUNK 4
+.Os
+.Sh NAME
+.Nm trunk
+.Nd link aggregation and link failover interface
+.Sh SYNOPSIS
+.Cd "pseudo-device trunk" Op Ar count
+.Sh DESCRIPTION
+The
+.Nm
+interface allows aggregation of multiple network interfaces as one virtual
+.Nm
+interface.
+.Pp
+A
+.Nm
+interface can be created using the
+.Ic ifconfig trunk Ns Ar N Ic create
+command.
+It can use different link aggregation protocols specified
+using the
+.Ic trunkproto Ar proto
+option.
+Child interfaces can be added using the
+.Ic trunkport Ar child-iface
+option and removed using the
+.Ic -trunkport Ar child-iface
+option.
+.Pp
+The driver currently supports the trunk protocols
+.Ic roundrobin 
+.Oo
+.Ic default
+.Oc
+and
+.Ic none
+for link aggregation and link failover.
+.Pp
+The configuration could be done at runtime or by setting up a
+.Xr hostname.if 5
+configuration file for
+.Xr netstart 8 .
+.Sh SEE ALSO
+.Xr inet 4 ,
+.Xr hostname.if 5 ,
+.Xr ifconfig 8 ,
+.Xr netstart 8
+.Sh HISTORY
+The
+.Nm
+device appeared in
+.Ox 3.8 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An Reyk Floeter Aq reyk@openbsd.org .
+.Sh CAVEATS
+Currently, only the roundrobin trunk protocol is supported.