Manpage bits for the recent changes in vlan(4) prio handling.

ok jmc henning sthen claudio

2 files changed, 12 insertions, 11 deletions

diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4
index 18db5d613fe..56cb508d5fd 100644
--- a/share/man/man4/vlan.4
+++ b/share/man/man4/vlan.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vlan.4,v 1.33 2010/06/08 13:24:16 jmc Exp $
+.\" $OpenBSD: vlan.4,v 1.34 2011/11/27 19:55:18 haesbaert Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 8 2010 $
+.Dd $Mdocdate: November 27 2011 $
 .Dt VLAN 4
 .Os
 .Sh NAME
@@ -83,9 +83,9 @@ comprising as follows:
 1 bit for the canonical field (always 0);
 and 12 bits for the vlan identifier.
 The priority field may be altered via
-.Xr ifconfig 8 ;
+.Xr pf.conf 5 ;
 see the
-.Cm vlanprio
+.Cm prio
 option for more information.
 Following the vlan header is the actual ether type for the frame and length
 information.
@@ -104,15 +104,11 @@ and
 .Nm svlan
 interfaces support the following unique
 .Xr ioctl 2 Ns s :
-.Bl -tag -width "SIOCSETVLANPRIO" -offset 3n
+.Bl -tag -width "SIOCSETVLAN" -offset 3n
 .It SIOCGETVLAN
 Get the vlan tag and parent for a given vlan interface.
-.It SIOCGETVLANPRIO
-Get the vlan priority for a given vlan interface.
 .It SIOCSETVLAN
 Set the vlan tag and parent for a given vlan interface.
-.It SIOCSETVLANPRIO
-Set the vlan priority for a given vlan interface.
 .El
 .Pp
 .Nm
@@ -168,6 +164,7 @@ and
 .Xr ip 4 ,
 .Xr netintro 4 ,
 .Xr hostname.if 5 ,
+.Xr pf.conf 5 ,
 .Xr ifconfig 8 ,
 .Xr netstart 8
 .Rs
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index a1765f59e23..3d5117b5c36 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pf.conf.5,v 1.508 2011/08/30 00:47:16 mikeb Exp $
+.\"	$OpenBSD: pf.conf.5,v 1.509 2011/11/27 19:55:18 haesbaert Exp $
 .\"
 .\" Copyright (c) 2002, Daniel Hartmeier
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 30 2011 $
+.Dd $Mdocdate: November 27 2011 $
 .Dt PF.CONF 5
 .Os
 .Sh NAME
@@ -621,6 +621,10 @@ For example, the following rule will drop 20% of incoming ICMP packets:
 Packets matching this rule will be assigned a specific queueing priority.
 Priorities are assigned as integers 0 through 7,
 with a default priority of 3.
+If the packet is transmitted on a
+.Xr vlan 4
+interface, the queueing priority will also be written as the priority
+code point in the 802.1Q VLAN header.
 If two priorities are given, packets which have a TOS of
 .Ar lowdelay
 and TCP ACKs with no data payload will be assigned to the second one.