net: Avoid modulus in skb_tx_hash() for forwarding case.

[karo-tx-linux.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 81442957c5c2f06669f7c848e21b2b3fdf42ba80..3c8073fe970aea77469da81df7264fb6936ac7ea 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1735,8 +1735,12 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb)
 {
        u32 hash;
 
-       if (skb_rx_queue_recorded(skb))
-               return skb_get_rx_queue(skb) % dev->real_num_tx_queues;
+       if (skb_rx_queue_recorded(skb)) {
+               hash = skb_get_rx_queue(skb);
+               while (unlikely (hash >= dev->real_num_tx_queues))
+                       hash -= dev->real_num_tx_queues;
+               return hash;
+       }
 
        if (skb->sk && skb->sk->sk_hash)
                hash = skb->sk->sk_hash;