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, 3 deletions

diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index 5df8377fcfb1..3e50ee8a218c 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -432,7 +432,7 @@ u32 ovs_vport_find_upcall_portid(const struct vport *p, struct sk_buff *skb)
  * skb->data should point to the Ethernet header.
  */
 void ovs_vport_receive(struct vport *vport, struct sk_buff *skb,
-                       struct ovs_key_ipv4_tunnel *tun_key)
+                       struct ovs_tunnel_info *tun_info)
 {
         struct pcpu_sw_netstats *stats;
         struct sw_flow_key key;
@@ -445,9 +445,9 @@ void ovs_vport_receive(struct vport *vport, struct sk_buff *skb,
         u64_stats_update_end(&stats->syncp);
 
         OVS_CB(skb)->input_vport = vport;
-        OVS_CB(skb)->egress_tun_key = NULL;
+        OVS_CB(skb)->egress_tun_info = NULL;
         /* Extract flow from 'skb' into 'key'. */
-        error = ovs_flow_key_extract(tun_key, skb, &key);
+        error = ovs_flow_key_extract(tun_info, skb, &key);
         if (unlikely(error)) {
                 kfree_skb(skb);
                 return;