openvswitch: Wrap struct ovs_key_ipv4_tunnel in a new structure.

Currently, the flow information that is matched for tunnels and
the tunnel data passed around with packets is the same. However,
as additional information is added this is not necessarily desirable,
as in the case of pointers.

This adds a new structure for tunnel metadata which currently contains
only the existing struct. This change is purely internal to the kernel
since the current OVS_KEY_ATTR_IPV4_TUNNEL is simply a compressed version
of OVS_KEY_ATTR_TUNNEL that is translated at flow setup.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 2 deletions

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 6932a42e41a2..006886dbee36 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -590,8 +590,8 @@ static int execute_set_action(struct sk_buff *skb,
                 skb->mark = nla_get_u32(nested_attr);
                 break;
 
-        case OVS_KEY_ATTR_IPV4_TUNNEL:
-                OVS_CB(skb)->egress_tun_key = nla_data(nested_attr);
+        case OVS_KEY_ATTR_TUNNEL_INFO:
+                OVS_CB(skb)->egress_tun_info = nla_data(nested_attr);
                 break;
 
         case OVS_KEY_ATTR_ETHERNET:
@@ -778,6 +778,7 @@ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
         acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts);
 
         this_cpu_inc(exec_actions_level);
+        OVS_CB(skb)->egress_tun_info = NULL;
         err = do_execute_actions(dp, skb, key,
                                  acts->actions, acts->actions_len);