Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / ipv4 / ip_tunnel_core.c

diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index c248e0dccbe17afa397910b0d68260daf2a9eb3f..9a0e67b52a4eec8875bb0ba557c84d67a9588123 100644 (file)
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -120,7 +120,7 @@ int __iptunnel_pull_header(struct sk_buff *skb, int hdr_len,
        }
 
        skb_clear_hash_if_not_l4(skb);
-       skb->vlan_tci = 0;
+       __vlan_hwaccel_clear_tag(skb);
        skb_set_queue_mapping(skb, 0);
        skb_scrub_packet(skb, xnet);
 
@@ -151,6 +151,7 @@ struct metadata_dst *iptunnel_metadata_reply(struct metadata_dst *md,
                       sizeof(struct in6_addr));
        else
                dst->key.u.ipv4.dst = src->key.u.ipv4.src;
+       dst->key.tun_flags = src->key.tun_flags;
        dst->mode = src->mode | IP_TUNNEL_INFO_TX;
 
        return res;