Merge remote-tracking branch 'spi/fix/core' into spi-linus

[~andy/linux] / net / ipv4 / ip_tunnel_core.c

diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 42ffbc8d65c65fda2b288008b4aed7670b43ee3f..6156f4ef5e919ccdc470f8cdb5a27593dedbe2c3 100644 (file)
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -56,7 +56,7 @@ int iptunnel_xmit(struct rtable *rt, struct sk_buff *skb,
 
        skb_scrub_packet(skb, xnet);
 
-       skb->rxhash = 0;
+       skb_clear_hash(skb);
        skb_dst_set(skb, &rt->dst);
        memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
 
@@ -107,8 +107,7 @@ int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto)
 
        nf_reset(skb);
        secpath_reset(skb);
-       if (!skb->l4_rxhash)
-               skb->rxhash = 0;
+       skb_clear_hash_if_not_l4(skb);
        skb_dst_drop(skb);
        skb->vlan_tci = 0;
        skb_set_queue_mapping(skb, 0);