diff options
| author | Jan Scheurich <jan.scheurich@ericsson.com> | 2017-05-06 15:49:43 +0000 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2017-05-08 10:31:50 -0400 |
| commit | 88fc5281621015ab6267be19b11c653f7597dbc0 (patch) | |
| tree | 9ec711202add73b12a2a162595d2674b2a9de464 /datapath | |
| parent | 06732e8920c96c88907d953e303b8927fa47cdea (diff) | |
| download | openvswitch-88fc5281621015ab6267be19b11c653f7597dbc0.tar.gz | |
userspace: Support for push_eth and pop_eth actions
Add support for actions push_eth and pop_eth to the netdev datapath and
the supporting libraries. This patch relies on the support for these actions
in the kernel datapath to be present.
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jean Tourrilhes <jt@labs.hpe.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Co-authored-by: Zoltan Balogh <zoltan.balogh@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/linux/compat/include/linux/openvswitch.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/datapath/linux/compat/include/linux/openvswitch.h b/datapath/linux/compat/include/linux/openvswitch.h index 72627f9ef..d22102e22 100644 --- a/datapath/linux/compat/include/linux/openvswitch.h +++ b/datapath/linux/compat/include/linux/openvswitch.h @@ -770,7 +770,6 @@ enum ovs_ct_attr { /* * struct ovs_action_push_eth - %OVS_ACTION_ATTR_PUSH_ETH action argument. * @addresses: Source and destination MAC addresses. - * @eth_type: Ethernet type */ struct ovs_action_push_eth { struct ovs_key_ethernet addresses; @@ -850,8 +849,7 @@ enum ovs_nat_attr { * entries in the flow key. * @OVS_ACTION_ATTR_PUSH_ETH: Push a new outermost Ethernet header onto the * packet. - * @OVS_ACTION_ATTR_POP_ETH: Pop the outermost Ethernet header off the - * packet. + * @OVS_ACTION_ATTR_POP_ETH: Pop the outermost Ethernet header off the packet. * * Only a single header can be set with a single %OVS_ACTION_ATTR_SET. Not all * fields within a header are modifiable, e.g. the IPv4 protocol and fragment |