stop lieing. vlan is not an encapsulation. it doesn't encapsulate ethernet

frames, it replaces the ethernet header by a slightly extended one.
ok sthen jmc

diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4
index 7942a1a..f9f5a39 100644 (file)
--- a/share/man/man4/vlan.4
+++ b/share/man/man4/vlan.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vlan.4,v 1.37 2013/06/02 20:23:34 tedu Exp $
+.\" $OpenBSD: vlan.4,v 1.38 2014/04/21 14:08:09 henning Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,13 +27,13 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 2 2013 $
+.Dd $Mdocdate: April 21 2014 $
 .Dt VLAN 4
 .Os
 .Sh NAME
 .Nm vlan ,
 .Nm svlan
-.Nd IEEE 802.1Q/1AD encapsulation/decapsulation pseudo-device
+.Nd IEEE 802.1Q/1AD pseudo-device
 .Sh SYNOPSIS
 .Cd "pseudo-device vlan"
 .Sh DESCRIPTION
@@ -67,17 +67,15 @@ Ethernet switch (or other 802.1Q compliant network devices) to be aware of
 which LAN the frame is part of, and in the case of a switch, which
 port(s) the frame can go to.
 Frames transmitted through the vlan interface will be diverted to the specified
-physical interface with 802.1Q vlan encapsulation.
-Frames with 802.1Q encapsulation received by the parent interface with the
+physical interface with a 802.1Q vlan header instead of the regular Ethernet
+header.
+802.1Q frames received by the parent interface with the
 correct vlan tag will be diverted to the associated
 .Nm
 pseudo-interface.
 .Pp
 Frame headers which normally contain the destination host, source host, and
-protocol, are altered with additional information.
-After the source host,
-a 32-bit 802.1Q header is included,
-comprising as follows:
+protocol, are altered with additional information, comprising as follows:
 16 bits for the ether type (0x8100);
 3 bits for the priority field;
 1 bit for the canonical field (always 0);