]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mlx4: use __netdev_pick_tx instead of __skb_tx_hash in mlx4_en_select_queue
authorgovindarajulu.v <govindarajulu90@gmail.com>
Mon, 3 Jun 2013 08:07:42 +0000 (08:07 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 5 Jun 2013 00:29:51 +0000 (17:29 -0700)
mlx4_en_select_queue() uses __skb_tx_hash to select the transmit queue.
XPS settings are ignored by this. Instead, we can use __netdev_pick_tx
to select the transmit queue.

Compile test only.

Signed-off-by: govindarajulu.v <govindarajulu90@gmail.com>
Acked-By: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx4/en_tx.c

index 4e6877a032a8414bd059e2dcf658616dc2cab0fe..7c492382da09937764e8c6bb9a835d1c05771021 100644 (file)
@@ -544,7 +544,7 @@ u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb)
        if (vlan_tx_tag_present(skb))
                up = vlan_tx_tag_get(skb) >> VLAN_PRIO_SHIFT;
 
-       return __skb_tx_hash(dev, skb, rings_p_up) + up * rings_p_up;
+       return __netdev_pick_tx(dev, skb) % rings_p_up + up * rings_p_up;
 }
 
 static void mlx4_bf_copy(void __iomem *dst, unsigned long *src, unsigned bytecnt)