diff options
| -rw-r--r-- | sbin/ifconfig/ifconfig.8 | 50 | ||||
| -rw-r--r-- | share/man/man4/tpmr.4 | 62 |
2 files changed, 65 insertions, 47 deletions
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 225d0f3e8fe..739e1f4ea32 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ifconfig.8,v 1.353 2020/07/26 18:34:10 kn Exp $ +.\" $OpenBSD: ifconfig.8,v 1.354 2020/08/05 14:55:40 kn Exp $ .\" $NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $ .\" $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $ .\" @@ -31,7 +31,7 @@ .\" .\" @(#)ifconfig.8 8.4 (Berkeley) 6/1/94 .\" -.Dd $Mdocdate: July 26 2020 $ +.Dd $Mdocdate: August 5 2020 $ .Dt IFCONFIG 8 .Os .Sh NAME @@ -204,6 +204,7 @@ At least the following devices can be created on demand: .Xr svlan 4 , .Xr switch 4 , .Xr tap 4 , +.Xr tpmr 4 , .Xr trunk 4 , .Xr tun 4 , .Xr vether 4 , @@ -831,6 +832,51 @@ is set to zero, then entries will not be expired. .It Cm up Start the bridge forwarding packets. .El +.Sh TPMR +.nr nS 1 +.Bk -words +.Nm ifconfig +.Ar tpmr-interface +.Op Cm add Ar child-iface +.Op Cm del Ar child-iface +.Op Oo Fl Oc Ns Cm link0 +.Op Oo Fl Oc Ns Cm link1 +.Op Oo Fl Oc Ns Cm link2 +.Ek +The following options are available for a +.Xr tpmr 4 +interface: +.Bl -tag -width Ds +.It Cm add Ar child-iface +Add +.Ar child-iface +as a member. +.It Cm del Ar child-iface +Remove the member +.Ar child-iface . +.It Cm link0 +Disable the filtering of Ethernet frames destined for the TPMR +component reserved addresses, as specified by IEEE 802.1Q. +.It Cm -link0 +Enable the filtering of Ethernet frames destined for the TPMR +component reserved addresses, as specified by IEEE 802.1Q. +This is the default. +.It Cm link1 +Disable the filtering of IPv4 and IPv6 packets with +.Xr pf 4 . +.It Cm -link1 +Enable the filtering of IPv4 and IPv6 packets with +.Xr pf 4 . +Packets will appear to enter or leave the member port interfaces. +This is the default. +.It Cm link2 +Disable the filtering of 802.1Q VLAN and QinQ SVLAN packets. +.It Cm -link2 +Enable the filtering of 802.1Q VLAN and QinQ SVLAN packets. +.Xr pf 4 . +Packets will appear to enter or leave the member port interfaces. +This is the default. +.El .Sh CARP .nr nS 1 .Bk -words diff --git a/share/man/man4/tpmr.4 b/share/man/man4/tpmr.4 index 98f4a679572..0997923ff51 100644 --- a/share/man/man4/tpmr.4 +++ b/share/man/man4/tpmr.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tpmr.4,v 1.6 2020/07/22 04:08:46 dlg Exp $ +.\" $OpenBSD: tpmr.4,v 1.7 2020/08/05 14:55:40 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 22 2020 $ +.Dd $Mdocdate: August 5 2020 $ .Dt TPMR 4 .Os .Sh NAME @@ -40,48 +40,6 @@ command or by setting up a .Xr hostname.if 5 configuration file for .Xr netstart 8 . -The interface itself can be configured with -.Xr ifconfig 8 ; -see its manual page for more information. -.Pp -.Nm -interfaces may be configured with -.Xr ifconfig 8 -and -.Xr netstart 8 -using the following options: -.Bl -tag -width Ds -.It Cm add Ar child-iface -Add -.Ar child-iface -as a member. -.It Cm del Ar child-iface -Remove the member -.Ar child-iface . -.It Cm link0 -Disable the filtering of Ethernet frames destined for the TPMR -component reserved addresses, as specified by IEEE 802.1Q. -.It Cm -link0 -Enable the filtering of Ethernet frames destined for the TPMR -component reserved addresses, as specified by IEEE 802.1Q. -This is the default. -.It Cm link1 -Disable the filtering of IPv4 and IPv6 packets with -.Xr pf 4 . -.It Cm -link1 -Enable the filtering of IPv4 and IPv6 packets with -.Xr pf 4 . -Packets will appear to enter or leave the member port interfaces. -This is the default. -.It Cm link2 -Disable the filtering of 802.1Q VLAN and QinQ SVLAN packets. -.It Cm -link2 -Enable the filtering of 802.1Q VLAN and QinQ SVLAN packets. -.Xr pf 4 . -Packets will appear to enter or leave the member port interfaces. -This is the default. -.El -.\" document the ioctls? .Pp Other forms of Ethernet bridging are available using the .Xr bridge 4 @@ -92,6 +50,20 @@ using the and .Xr trunk 4 drivers. +.Sh IOCTLS +The following +.Xr ioctl 2 +calls and their structures are commonly use by +.Nm +and +.Xr bridge 4 : +.Pp +.Bl -bullet -offset indent -compact +.It +.Dv SIOCBRDGADD +.It +.Dv SIOCBRDGDEL +.El .Sh EXAMPLES .Nm can be used to cross-connect Ethernet devices that support different @@ -107,7 +79,7 @@ is used to connect to the 100baseTX device, and .Xr em 4 is used to connect to the 1000baseSX switch, the following configuration can be used: -.Bd -literal +.Bd -literal -offset indent # ifconfig tpmr0 create # ifconfig tpmr0 add fxp0 add em0 # ifconfig fxp0 up |