On Thu, Jul 24, 2014 at 2:37 AM, Andy Zhou <az...@nicira.com> wrote:
> Keeping the order of netlink attribute definition in the order of
> upstreaming is the best way to keep all released user space program
> forward compatible with upstreamed kernel modules.
>
> Adjust action netlink attribute order to match with the current
> upstreaming plan.
>
> Signed-off-by: Andy Zhou <az...@nicira.com>
> ---
> include/linux/openvswitch.h | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h
> index bf27dcb..5f90dd9 100644
> --- a/include/linux/openvswitch.h
> +++ b/include/linux/openvswitch.h
> @@ -579,6 +579,8 @@ struct ovs_action_hash {
> * @OVS_ACTION_ATTR_SET: Replaces the contents of an existing header. The
> * single nested %OVS_KEY_ATTR_* attribute specifies a header to modify and
> its
> * value.
> + * @OVS_ACTION_HASH: Compute and set flow hash value.
> + * @OVS_ACTION_RECIRC: Recirculate within the data path.
> * @OVS_ACTION_ATTR_PUSH_MPLS: Push a new MPLS label stack entry onto the
> * top of the packets MPLS label stack. Set the ethertype of the
> * encapsulating frame to either %ETH_P_MPLS_UC or %ETH_P_MPLS_MC to
> @@ -588,7 +590,6 @@ struct ovs_action_hash {
> * indicate the new packet contents. This could potentially still be
> * %ETH_P_MPLS if the resulting MPLS label stack is not empty. If there
> * is no MPLS label stack, as determined by ethertype, no action is taken.
> - * @OVS_ACTION_RECIRC: Recirculate within the data path.
> *
> * 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
> @@ -603,10 +604,10 @@ 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_HASH, /* struct ovs_action_hash. */
> + OVS_ACTION_ATTR_RECIRC, /* u32 recirc_id. */
> OVS_ACTION_ATTR_PUSH_MPLS, /* struct ovs_action_push_mpls. */
> OVS_ACTION_ATTR_POP_MPLS, /* __be16 ethertype. */
> - OVS_ACTION_ATTR_RECIRC, /* u32 recirc_id. */
> - OVS_ACTION_ATTR_HASH, /* struct ovs_action_hash. */
> __OVS_ACTION_ATTR_MAX
> };
>
since we changing ordering anyways, Lets move RECIRC on top of HASH.
In most common usecase HASH depends on RECIRC.
otherwise looks good.
Acked-by: Pravin B Shelar <pshe...@nicira.com>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
