openvswitch: Use tun_key only for egress tunnel path.

[firefly-linux-kernel-4.4.55.git] / net / openvswitch / vport-vxlan.c

diff --git a/net/openvswitch/vport-vxlan.c b/net/openvswitch/vport-vxlan.c
index d8b7e247bebff5c5f4c3b83345ca5e4f492be60b..f19539bb8adcc299b55b5daf4f89c0b8004404e4 100644 (file)
--- a/net/openvswitch/vport-vxlan.c
+++ b/net/openvswitch/vport-vxlan.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Nicira, Inc.
+ * Copyright (c) 2014 Nicira, Inc.
  * Copyright (c) 2013 Cisco Systems, Inc.
  *
  * This program is free software; you can redistribute it and/or
@@ -140,22 +140,24 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb)
        struct net *net = ovs_dp_get_net(vport->dp);
        struct vxlan_port *vxlan_port = vxlan_vport(vport);
        __be16 dst_port = inet_sk(vxlan_port->vs->sock->sk)->inet_sport;
+       struct ovs_key_ipv4_tunnel *tun_key;
        struct rtable *rt;
        struct flowi4 fl;
        __be16 src_port;
        __be16 df;
        int err;
 
-       if (unlikely(!OVS_CB(skb)->tun_key)) {
+       if (unlikely(!OVS_CB(skb)->egress_tun_key)) {
                err = -EINVAL;
                goto error;
        }
 
+       tun_key = OVS_CB(skb)->egress_tun_key;
        /* Route lookup */
        memset(&fl, 0, sizeof(fl));
-       fl.daddr = OVS_CB(skb)->tun_key->ipv4_dst;
-       fl.saddr = OVS_CB(skb)->tun_key->ipv4_src;
-       fl.flowi4_tos = RT_TOS(OVS_CB(skb)->tun_key->ipv4_tos);
+       fl.daddr = tun_key->ipv4_dst;
+       fl.saddr = tun_key->ipv4_src;
+       fl.flowi4_tos = RT_TOS(tun_key->ipv4_tos);
        fl.flowi4_mark = skb->mark;
        fl.flowi4_proto = IPPROTO_UDP;
 
@@ -165,7 +167,7 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb)
                goto error;
        }
 
-       df = OVS_CB(skb)->tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ?
+       df = tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ?
                htons(IP_DF) : 0;
 
        skb->ignore_df = 1;
@@ -173,11 +175,10 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb)
        src_port = udp_flow_src_port(net, skb, 0, 0, true);
 
        err = vxlan_xmit_skb(vxlan_port->vs, rt, skb,
-                            fl.saddr, OVS_CB(skb)->tun_key->ipv4_dst,
-                            OVS_CB(skb)->tun_key->ipv4_tos,
-                            OVS_CB(skb)->tun_key->ipv4_ttl, df,
+                            fl.saddr, tun_key->ipv4_dst,
+                            tun_key->ipv4_tos, tun_key->ipv4_ttl, df,
                             src_port, dst_port,
-                            htonl(be64_to_cpu(OVS_CB(skb)->tun_key->tun_id) << 8),
+                            htonl(be64_to_cpu(tun_key->tun_id) << 8),
                             false);
        if (err < 0)
                ip_rt_put(rt);