On 1/6/14 6:30 PM, Jesse Gross wrote:
On Tue, Dec 24, 2013 at 9:02 AM, Lorand Jakab <loja...@cisco.com> wrote:
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h
index 5137c2f..46b3634 100644
--- a/include/linux/openvswitch.h
+++ b/include/linux/openvswitch.h
* @OVS_ACTION_ATTR_OUTPUT: Output packet to port.
@@ -569,6 +579,8 @@ enum ovs_action_attr {
OVS_ACTION_ATTR_SAMPLE, /* Nested OVS_SAMPLE_ATTR_*. */
OVS_ACTION_ATTR_PUSH_MPLS, /* struct ovs_action_push_mpls. */
OVS_ACTION_ATTR_POP_MPLS, /* __be16 ethertype. */
+ OVS_ACTION_ATTR_PUSH_ETH, /* struct ovs_action_push_eth. */
+ OVS_ACTION_ATTR_POP_ETH, /* No argument. */
__OVS_ACTION_ATTR_MAX
};
Given that there is no kernel code for MPLS currently checked in, we
should temporarily move those attributes to a high value and make the
push/pop Ethernet actions be the next in the list after SAMPLE
(similar to the MPLS match).
Thanks for reviewing!
Should I just switch positions, or should I explicitly set the MPLS
actions to high values, something like:
@@ -567,6 +577,8 @@ enum ovs_action_attr {
OVS_ACTION_ATTR_PUSH_VLAN, /* struct ovs_action_push_vlan. */
OVS_ACTION_ATTR_POP_VLAN, /* No argument. */
OVS_ACTION_ATTR_SAMPLE, /* Nested OVS_SAMPLE_ATTR_*. */
+ OVS_ACTION_ATTR_PUSH_ETH, /* struct ovs_action_push_eth. */
+ OVS_ACTION_ATTR_POP_ETH, /* No argument. */
OVS_ACTION_ATTR_PUSH_MPLS = 32, /* struct
ovs_action_push_mpls. */
OVS_ACTION_ATTR_POP_MPLS = 33, /* __be16 ethertype. */
__OVS_ACTION_ATTR_MAX
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
