From 3f30071d5ae2532d8902ae4f2afa7076cfbfa070 Mon Sep 17 00:00:00 2001 From: Jesse Gross Date: Mon, 5 Nov 2012 11:08:47 -0800 Subject: [PATCH] datapath: Include OVS_KEY_ATTR_IPV4_TUNNEL in upstream range. During development it was preferable to keep OVS_KEY_ATTR_IPV4_TUNNEL in the non-upstream range of identifiers to avoid conflicts or compatibility issues as it evolved. However, since the intention is to get it upstream, it makes sense to move it down now to avoid issues with compatibility when upgrading. Signed-off-by: Jesse Gross Acked-by: Kyle Mestery --- datapath/flow.c | 2 +- include/linux/openvswitch.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datapath/flow.c b/datapath/flow.c index de42acea3..2acdd0599 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -846,10 +846,10 @@ const int ovs_key_lens[OVS_KEY_ATTR_MAX + 1] = { [OVS_KEY_ATTR_ICMPV6] = sizeof(struct ovs_key_icmpv6), [OVS_KEY_ATTR_ARP] = sizeof(struct ovs_key_arp), [OVS_KEY_ATTR_ND] = sizeof(struct ovs_key_nd), + [OVS_KEY_ATTR_IPV4_TUNNEL] = sizeof(struct ovs_key_ipv4_tunnel), /* Not upstream. */ [OVS_KEY_ATTR_TUN_ID] = sizeof(__be64), - [OVS_KEY_ATTR_IPV4_TUNNEL] = sizeof(struct ovs_key_ipv4_tunnel), }; static int ipv4_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_len, diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h index e76135749..e3e41919f 100644 --- a/include/linux/openvswitch.h +++ b/include/linux/openvswitch.h @@ -280,7 +280,7 @@ enum ovs_key_attr { OVS_KEY_ATTR_ICMPV6, /* struct ovs_key_icmpv6 */ OVS_KEY_ATTR_ARP, /* struct ovs_key_arp */ OVS_KEY_ATTR_ND, /* struct ovs_key_nd */ - OVS_KEY_ATTR_IPV4_TUNNEL = 62, /* struct ovs_key_ipv4_tunnel */ + OVS_KEY_ATTR_IPV4_TUNNEL, /* struct ovs_key_ipv4_tunnel */ OVS_KEY_ATTR_TUN_ID = 63, /* be64 tunnel ID */ __OVS_KEY_ATTR_MAX }; -- 2.20.1