]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ip_tunnel: do not clear l4 hashes
authorEric Dumazet <edumazet@google.com>
Thu, 8 Sep 2016 22:40:48 +0000 (15:40 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 10 Sep 2016 02:33:11 +0000 (19:33 -0700)
If skb has a valid l4 hash, there is no point clearing hash and force
a further flow dissection when a tunnel encapsulation is added.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_tunnel_core.c

index 0f227db0e9ac6637c444fc8060b2e8f067653c3d..777bc1883870ec91d7c4df9adfde50fc3f384043 100644 (file)
@@ -69,7 +69,7 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
 
        skb_scrub_packet(skb, xnet);
 
-       skb_clear_hash(skb);
+       skb_clear_hash_if_not_l4(skb);
        skb_dst_set(skb, &rt->dst);
        memset(IPCB(skb), 0, sizeof(*IPCB(skb)));