Omit common ifconfig options

ifconfig(8)'s TRUNK (LINK AGGREGATION) nicely combines the two drivers, so
omit common stuff from the drives specific manuals.

This aids in the overall design of having options documented in ifconfig(8)
alone unless they're inherently driver specific, e.g. "trunkproto" which
stays in trunk(4).

OK jmc

2 files changed, 4 insertions, 32 deletions

diff --git a/share/man/man4/aggr.4 b/share/man/man4/aggr.4
index 6fe2f455b9a..b36bb2812e4 100644
--- a/share/man/man4/aggr.4
+++ b/share/man/man4/aggr.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: aggr.4,v 1.2 2019/07/05 05:22:57 jmc Exp $
+.\" $OpenBSD: aggr.4,v 1.3 2020/08/24 07:34:00 kn Exp $
 .\"
 .\" Copyright (c) 2019 David Gwynne <dlg@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 5 2019 $
+.Dd $Mdocdate: August 24 2020 $
 .Dt AGGR 4
 .Os
 .Sh NAME
@@ -63,30 +63,11 @@ and
 .Xr netstart 8
 using the following options:
 .Bl -tag -width Ds
-.It Cm lacpmode Cm active Ns | Ns Cm passive
-Set the LACP mode to either
-.Cm active
-or
-.Cm passive .
-The default is active mode.
-.It Cm lacptimeout Cm fast Ns | Ns Cm slow
-Set the LACP timeout speed to either
-.Cm fast
-or
-.Cm slow .
-The default is slow timeouts.
 .It Cm lladdr Ar etheraddr Ns | Ns Cm random
 Change the link layer address (MAC address) of the interface.
 This should be specified as six colon-separated hex values, or can
 be chosen randomly.
 By default a random MAC address is generated when an interface is created.
-.It Cm trunkport Ar child-iface
-Add
-.Ar child-iface
-as a port.
-.It Cm -trunkport Ar child-iface
-Remove the port
-.Ar child-iface .
 .El
 .\" document the ioctls?
 .Pp
diff --git a/share/man/man4/trunk.4 b/share/man/man4/trunk.4
index 26bedbce968..94c00e3fd10 100644
--- a/share/man/man4/trunk.4
+++ b/share/man/man4/trunk.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trunk.4,v 1.30 2018/08/12 23:50:31 ccardenas Exp $
+.\"	$OpenBSD: trunk.4,v 1.31 2020/08/24 07:34:00 kn Exp $
 .\"
 .\" Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 12 2018 $
+.Dd $Mdocdate: August 24 2020 $
 .Dt TRUNK 4
 .Os
 .Sh NAME
@@ -34,15 +34,6 @@ A
 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 broadcast ,