3 files changed, 14 insertions, 20 deletions
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index cdb72371927..29ea4c1ad88 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ifconfig.8,v 1.223 2011/11/02 20:01:59 haesbaert Exp $
+.\"	$OpenBSD: ifconfig.8,v 1.224 2011/11/27 19:55:18 haesbaert 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: November 2 2011 $
+.Dd $Mdocdate: November 27 2011 $
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -1465,7 +1465,6 @@ the corresponding routing domain is derived from this table.
 .Ar vlan-interface
 .Op Cm vlan Ar vlan-tag
 .Op Oo Fl Oc Ns Cm vlandev Ar parent-interface
-.Op Cm vlanprio Ar vlan-priority
 .Ek
 .nr nS 0
 .Pp
@@ -1504,12 +1503,6 @@ will be assigned 802.1Q tag 5.
 Disassociate from the parent interface.
 This breaks the link between the vlan interface and its parent,
 clears its vlan tag, flags, and link address, and shuts the interface down.
-.It Cm vlanprio Ar vlan-priority
-Set the vlan priority value
-to
-.Ar vlan-priority .
-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
 .Sh EXAMPLES
 Assign the
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.