diff options
author | Atzm Watanabe <atzm@stratosphere.co.jp> | 2013-12-20 09:12:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-12-21 00:01:40 -0500 |
commit | ac7686b9698038cdf5148c9904db907448dceca4 (patch) | |
tree | afc094555d3cf0fc17732cbf41b1c74586e7f83c /Documentation | |
parent | ac0917f250c61ae1e395844ebd924db0e07d1f87 (diff) |
packet: doc: add documentation for VLAN TPID delivery
Introduce TP_STATUS_VLAN_TPID_VALID bit into the documentation.
Signed-off-by: Atzm Watanabe <atzm@stratosphere.co.jp>
Acked-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/networking/packet_mmap.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt index 4288ffafba9f..723bf3d33a6e 100644 --- a/Documentation/networking/packet_mmap.txt +++ b/Documentation/networking/packet_mmap.txt | |||
@@ -517,8 +517,6 @@ where 'tpacket_version' can be TPACKET_V1 (default), TPACKET_V2, TPACKET_V3. | |||
517 | TPACKET_V1: | 517 | TPACKET_V1: |
518 | - Default if not otherwise specified by setsockopt(2) | 518 | - Default if not otherwise specified by setsockopt(2) |
519 | - RX_RING, TX_RING available | 519 | - RX_RING, TX_RING available |
520 | - VLAN metadata information available for packets | ||
521 | (TP_STATUS_VLAN_VALID) | ||
522 | 520 | ||
523 | TPACKET_V1 --> TPACKET_V2: | 521 | TPACKET_V1 --> TPACKET_V2: |
524 | - Made 64 bit clean due to unsigned long usage in TPACKET_V1 | 522 | - Made 64 bit clean due to unsigned long usage in TPACKET_V1 |
@@ -526,6 +524,13 @@ TPACKET_V1 --> TPACKET_V2: | |||
526 | userspace and the like | 524 | userspace and the like |
527 | - Timestamp resolution in nanoseconds instead of microseconds | 525 | - Timestamp resolution in nanoseconds instead of microseconds |
528 | - RX_RING, TX_RING available | 526 | - RX_RING, TX_RING available |
527 | - VLAN metadata information available for packets | ||
528 | (TP_STATUS_VLAN_VALID, TP_STATUS_VLAN_TPID_VALID), | ||
529 | in the tpacket2_hdr structure: | ||
530 | - TP_STATUS_VLAN_VALID bit being set into the tp_status field indicates | ||
531 | that the tp_vlan_tci field has valid VLAN TCI value | ||
532 | - TP_STATUS_VLAN_TPID_VALID bit being set into the tp_status field | ||
533 | indicates that the tp_vlan_tpid field has valid VLAN TPID value | ||
529 | - How to switch to TPACKET_V2: | 534 | - How to switch to TPACKET_V2: |
530 | 1. Replace struct tpacket_hdr by struct tpacket2_hdr | 535 | 1. Replace struct tpacket_hdr by struct tpacket2_hdr |
531 | 2. Query header len and save | 536 | 2. Query header len and save |