summaryrefslogtreecommitdiff
path: root/share/man
diff options
context:
space:
mode:
authorSebastian Benoit <benno@cvs.openbsd.org>2021-07-28 19:19:39 +0000
committerSebastian Benoit <benno@cvs.openbsd.org>2021-07-28 19:19:39 +0000
commitc16f65d051a455b817b0d236636d3fad4221ae85 (patch)
tree6592e6acbcbd20580cbf75faa25c7673b87dd7d3 /share/man
parente02e3f03945163a79c1c5d085dbae1c7d1a85b7f (diff)
reference veb(4) bridges in tpmr(4). While there improve the description.
With and ok jmc@
Diffstat (limited to 'share/man')
-rw-r--r--share/man/man4/tpmr.416
1 files changed, 8 insertions, 8 deletions
diff --git a/share/man/man4/tpmr.4 b/share/man/man4/tpmr.4
index ab9eba4cee3..69758dd5fef 100644
--- a/share/man/man4/tpmr.4
+++ b/share/man/man4/tpmr.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tpmr.4,v 1.9 2020/08/24 07:40:03 kn Exp $
+.\" $OpenBSD: tpmr.4,v 1.10 2021/07/28 19:19:38 benno 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: August 24 2020 $
+.Dd $Mdocdate: July 28 2021 $
.Dt TPMR 4
.Os
.Sh NAME
@@ -27,11 +27,8 @@ The
.Nm
driver implements an 802.1Q (originally 802.1aj) Two-Port MAC Relay
(TPMR).
-A TPMR is a simplified Ethernet bridge that provides a subset of
-the functionality as found in
-.Xr bridge 4 .
-A TPMR has exactly two member ports, and unconditionally relays
-Ethernet packets between them.
+A TPMR is a simplified Ethernet bridge with exactly two member ports,
+and it unconditionally relays Ethernet packets between those ports.
.Pp
.Nm
interfaces can be created at runtime using the
@@ -43,7 +40,9 @@ configuration file for
.Pp
Other forms of Ethernet bridging are available using the
.Xr bridge 4
-driver.
+Ethernet bridge driver and the
+.Xr veb 4
+Virtual Ethernet Bridge device.
Link aggregation of Ethernet interfaces can be achieved
using the
.Xr aggr 4
@@ -145,6 +144,7 @@ interfaces.
.Xr bridge 4 ,
.Xr pf 4 ,
.Xr trunk 4 ,
+.Xr veb 4 ,
.Xr hostname.if 5 ,
.Xr ifconfig 8 ,
.Xr netstart 8