Commit 8c146bb9 authored by Thomas F Herbert's avatar Thomas F Herbert Committed by David S. Miller

openvswitch: 802.1ad uapi changes.

openvswitch: Add support for 8021.AD

Change the description of the VLAN tpid field.
Signed-off-by: default avatarThomas F Herbert <thomasfherbert@gmail.com>
Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d545caca
...@@ -605,13 +605,13 @@ struct ovs_action_push_mpls { ...@@ -605,13 +605,13 @@ struct ovs_action_push_mpls {
* @vlan_tci: Tag control identifier (TCI) to push. The CFI bit must be set * @vlan_tci: Tag control identifier (TCI) to push. The CFI bit must be set
* (but it will not be set in the 802.1Q header that is pushed). * (but it will not be set in the 802.1Q header that is pushed).
* *
* The @vlan_tpid value is typically %ETH_P_8021Q. The only acceptable TPID * The @vlan_tpid value is typically %ETH_P_8021Q or %ETH_P_8021AD.
* values are those that the kernel module also parses as 802.1Q headers, to * The only acceptable TPID values are those that the kernel module also parses
* prevent %OVS_ACTION_ATTR_PUSH_VLAN followed by %OVS_ACTION_ATTR_POP_VLAN * as 802.1Q or 802.1AD headers, to prevent %OVS_ACTION_ATTR_PUSH_VLAN followed
* from having surprising results. * by %OVS_ACTION_ATTR_POP_VLAN from having surprising results.
*/ */
struct ovs_action_push_vlan { struct ovs_action_push_vlan {
__be16 vlan_tpid; /* 802.1Q TPID. */ __be16 vlan_tpid; /* 802.1Q or 802.1ad TPID. */
__be16 vlan_tci; /* 802.1Q TCI (VLAN ID and priority). */ __be16 vlan_tci; /* 802.1Q TCI (VLAN ID and priority). */
}; };
...@@ -721,9 +721,10 @@ enum ovs_nat_attr { ...@@ -721,9 +721,10 @@ enum ovs_nat_attr {
* is copied from the value to the packet header field, rest of the bits are * is copied from the value to the packet header field, rest of the bits are
* left unchanged. The non-masked value bits must be passed in as zeroes. * left unchanged. The non-masked value bits must be passed in as zeroes.
* Masking is not supported for the %OVS_KEY_ATTR_TUNNEL attribute. * Masking is not supported for the %OVS_KEY_ATTR_TUNNEL attribute.
* @OVS_ACTION_ATTR_PUSH_VLAN: Push a new outermost 802.1Q header onto the * @OVS_ACTION_ATTR_PUSH_VLAN: Push a new outermost 802.1Q or 802.1ad header
* packet. * onto the packet.
* @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q header off the packet. * @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q or 802.1ad header
* from the packet.
* @OVS_ACTION_ATTR_SAMPLE: Probabilitically executes actions, as specified in * @OVS_ACTION_ATTR_SAMPLE: Probabilitically executes actions, as specified in
* the nested %OVS_SAMPLE_ATTR_* attributes. * the nested %OVS_SAMPLE_ATTR_* attributes.
* @OVS_ACTION_ATTR_PUSH_MPLS: Push a new MPLS label stack entry onto the * @OVS_ACTION_ATTR_PUSH_MPLS: Push a new MPLS label stack entry onto the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment