From 7b62d98bf89bb691aaf7a9af2d2a9f9539b655ca Mon Sep 17 00:00:00 2001
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Tue, 10 Apr 2007 00:35:31 +0000
Subject: [PATCH] Hook trunk(4) up to the build.

---
 sbin/ifconfig/Makefile   |  1 +
 sbin/ifconfig/ifconfig.8 | 17 +++++++++++++++++
 share/man/man4/Makefile  |  1 +
 sys/conf/NOTES           |  1 +
 sys/conf/files           |  2 ++
 5 files changed, 22 insertions(+)

diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index 672d8884520b..5520cf77bead 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -30,6 +30,7 @@ SRCS+=	ifgroup.c		# ...
 SRCS+=	ifpfsync.c		# pfsync(4) support
 
 SRCS+=	ifbridge.c		# bridge support
+SRCS+=	iftrunk.c		# trunk support
 
 .if ${MK_IPX_SUPPORT} != "no" && !defined(RELEASE_CRUNCH)
 SRCS+=	af_ipx.c		# IPX support
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 702632833111..be0e96b492a3 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1367,6 +1367,23 @@ cost to 0.
 The minimum is 1 and the maximum is 200000000.
 .El
 .Pp
+The following parameters are specific to trunk interfaces:
+.Bl -tag -width indent
+.It Cm trunkport Ar interface
+Add the interface named by
+.Ar interface
+as a port of the trunk.
+.It Cm -trunkport Ar interface
+Remove the interface named by
+.Ar interface
+from the trunk.
+.It Cm trunkproto Ar proto
+Set the trunking protocol.
+The default is failover.
+The available options are failover, fec, lacp, loadbalance, roundrobin and
+none.
+.El
+.Pp
 The following parameters are specific to IP tunnel interfaces,
 .Xr gif 4 :
 .Bl -tag -width indent
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 2cd45c454137..54a996ec999f 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -348,6 +348,7 @@ MAN=	aac.4 \
 	ti.4 \
 	tl.4 \
 	trm.4 \
+	trunk.4 \
 	tty.4 \
 	tun.4 \
 	twa.4 \
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 37cdf46ebf8f..d5dae123c5ba 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -813,6 +813,7 @@ device		ppp			#Point-to-point protocol
 options 	PPP_BSDCOMP		#PPP BSD-compress support
 options 	PPP_DEFLATE		#PPP zlib/deflate/gzip support
 options 	PPP_FILTER		#enable bpf filtering (needs bpf)
+options		trunk			#Trunk aggregation interface
 
 device		ef			# Multiple ethernet frames support
 options 	ETHER_II		# enable Ethernet_II frame
diff --git a/sys/conf/files b/sys/conf/files
index 65659d3e3de0..d56dd0d131ad 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1527,6 +1527,7 @@ net/bpf_jitter.c		optional bpf_jitter
 net/bpf_filter.c		optional bpf | netgraph_bpf
 net/bridgestp.c			optional if_bridge
 net/bsd_comp.c			optional ppp_bsdcomp
+net/ieee8023ad_lacp.c		optional trunk
 net/if.c			standard
 net/if_arcsubr.c		optional arcnet
 net/if_atmsubr.c		optional atm
@@ -1553,6 +1554,7 @@ net/if_spppsubr.c		optional i4bisppp | sppp
 net/if_stf.c			optional stf
 net/if_tun.c			optional tun
 net/if_tap.c			optional tap
+net/if_trunk.c			optional trunk
 net/if_vlan.c			optional vlan
 net/netisr.c			standard
 net/ppp_deflate.c		optional ppp_deflate