Merge branch 'mainstream'
[sliver-openvswitch.git] / datapath / vport-vxlan.c
index d7dd6b8..de49ab1 100644 (file)
@@ -156,8 +156,6 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb)
                goto error;
        }
 
-       forward_ip_summed(skb, true);
-
        /* Route lookup */
        saddr = OVS_CB(skb)->tun_key->ipv4_src;
        rt = find_route(ovs_dp_get_net(vport->dp),
@@ -165,7 +163,7 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb)
                        OVS_CB(skb)->tun_key->ipv4_dst,
                        IPPROTO_UDP,
                        OVS_CB(skb)->tun_key->ipv4_tos,
-                       skb_get_mark(skb));
+                       skb->mark);
        if (IS_ERR(rt)) {
                err = PTR_ERR(rt);
                goto error;