summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorPierre-Yves Ritschard <pyr@cvs.openbsd.org>2008-05-07 02:43:46 +0000
committerPierre-Yves Ritschard <pyr@cvs.openbsd.org>2008-05-07 02:43:46 +0000
commit7bdcb7674e14048e5ca5afa66643a47c78e80e06 (patch)
treeede88840fc4b9763ca5b1b216a82b7f6ed3f8d43 /sbin
parenta85f69c61a76f9552e1ef6903a57fa34a93fb5a0 (diff)
Document the new mpe interface and explain the appropriate commands
in ifconfig(8). The man pages reference mpls(8) which doesn't exist, but claudio promises it will follow shortly. a thumb up and ok from claudio@
Diffstat (limited to 'sbin')
-rw-r--r--sbin/ifconfig/ifconfig.827
1 files changed, 24 insertions, 3 deletions
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 629774156a2..0ad7afdeb42 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ifconfig.8,v 1.157 2008/04/18 17:01:50 damien Exp $
+.\" $OpenBSD: ifconfig.8,v 1.158 2008/05/07 02:43:45 pyr 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: April 18 2008 $
+.Dd $Mdocdate: May 7 2008 $
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -189,7 +189,8 @@ At least the following devices can be created on demand:
.Xr sl 4 ,
.Xr trunk 4 ,
.Xr tun 4 ,
-.Xr vlan 4
+.Xr vlan 4,
+.Xr mpe 4
.It Cm debug
Enable driver-dependent debugging code; usually, this turns on
extra console error logging.
@@ -441,6 +442,8 @@ and
.Xr gre 4 )
.It
.Xr vlan 4
+.It
+.Xr mpe 4
.El
.\" CARP
.Sh CARP
@@ -1131,6 +1134,24 @@ to
This value is a 3-bit number which is used to create an 802.1Q
vlan header for packets sent from the vlan interface.
.El
+.\" MPE
+.Sh MPE
+.Nm ifconfig
+.Bk -words
+.Ar mpe-interface
+.Op Cm mplslabel Ar mpls-label
+.Ek
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Cm mplslabel Ar mpls-label
+If the interface is a
+.Xr mpe 4
+pseudo-interface, set the mpls label to
+.Ar mpls-label .
+This value is a 20-bit number which will be used as the MPLS header for
+packets entering the MPLS domain.
+.El
.Sh EXAMPLES
Assign the
address of 192.168.1.10 with a network mask of