summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthompsa <thompsa@FreeBSD.org>2007-04-10 00:35:31 +0000
committerthompsa <thompsa@FreeBSD.org>2007-04-10 00:35:31 +0000
commit994b9b86e7887426d4757742a9c6c5f0459d7cb6 (patch)
treea4479a42542a37189c2a5e340d6ca8248878f346
parent31737a26bdcf828bee38bbc94acd9a62925b551c (diff)
downloadFreeBSD-src-994b9b86e7887426d4757742a9c6c5f0459d7cb6.zip
FreeBSD-src-994b9b86e7887426d4757742a9c6c5f0459d7cb6.tar.gz
Hook trunk(4) up to the build.
-rw-r--r--sbin/ifconfig/Makefile1
-rw-r--r--sbin/ifconfig/ifconfig.817
-rw-r--r--share/man/man4/Makefile1
-rw-r--r--sys/conf/NOTES1
-rw-r--r--sys/conf/files2
5 files changed, 22 insertions, 0 deletions
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index 672d888..5520cf7 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 7026328..be0e96b 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 2cd45c4..54a996e 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 37cdf46..d5dae12 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 65659d3..d56dd0d 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
OpenPOWER on IntegriCloud