diff options
| author | Pravin Shelar <pshelar@nicira.com> | 2011-09-09 18:13:26 -0700 |
|---|---|---|
| committer | Pravin Shelar <pshelar@nicira.com> | 2011-09-09 18:13:26 -0700 |
| commit | d9065a90b6b955aa38586c952e8804ca7a22547e (patch) | |
| tree | 76f07c99c491ccbfc247fc52961e05b56ec53b04 /include | |
| parent | f37c91c76785e335e9d89aa31a7f0ab290223193 (diff) | |
| download | openvswitch-d9065a90b6b955aa38586c952e8804ca7a22547e.tar.gz | |
datapath: VLAN actions should use push/pop semantics
Currently the kernel vlan actions mirror those used by OpenFlow 1.0.
i.e. MODIFY and STRIP. More flexible approach is to have an action to
push a tag and pop a tag off, so that it can handle multiple levels of vlan
tags. Plus it aligns with newer version of OpenFlow.
As this patch replaces MODIFY with PUSH semantic, action
mapping done in userpace is fixed accordingly.
GSO handling for multiple levels of vlan tags is also added as
Jesse suggested before.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openvswitch/datapath-protocol.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h index 97a7c04df..c1c9ef04e 100644 --- a/include/openvswitch/datapath-protocol.h +++ b/include/openvswitch/datapath-protocol.h @@ -409,8 +409,8 @@ enum ovs_action_type { OVS_ACTION_ATTR_UNSPEC, OVS_ACTION_ATTR_OUTPUT, /* Output to switch port. */ OVS_ACTION_ATTR_USERSPACE, /* Send copy to userspace. */ - OVS_ACTION_ATTR_SET_DL_TCI, /* Set the 802.1q TCI value. */ - OVS_ACTION_ATTR_STRIP_VLAN, /* Strip the 802.1q header. */ + OVS_ACTION_ATTR_PUSH_VLAN, /* Set the 802.1q TCI value. */ + OVS_ACTION_ATTR_POP_VLAN, /* Strip the 802.1q header. */ OVS_ACTION_ATTR_SET_DL_SRC, /* Ethernet source address. */ OVS_ACTION_ATTR_SET_DL_DST, /* Ethernet destination address. */ OVS_ACTION_ATTR_SET_NW_SRC, /* IPv4 source address. */ |