Merge tag 'for-3.14' of git://openrisc.net/~jonas/linux

[~andy/linux] / include / net / dst.h

diff --git a/include/net/dst.h b/include/net/dst.h
index 44995c13e941df814db2433819d2934869df4d0f..77eb53fabfb00d6e446d89066937621b22c68e44 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -322,12 +322,11 @@ static inline void __skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev,
        skb->dev = dev;
 
        /*
-        * Clear rxhash so that we can recalulate the hash for the
+        * Clear hash so that we can recalulate the hash for the
         * encapsulated packet, unless we have already determine the hash
         * over the L4 4-tuple.
         */
-       if (!skb->l4_rxhash)
-               skb->rxhash = 0;
+       skb_clear_hash_if_not_l4(skb);
        skb_set_queue_mapping(skb, 0);
        skb_scrub_packet(skb, !net_eq(net, dev_net(dev)));
 }