net: add netdev_txq_bql_{enqueue, complete}_prefetchw() helpers

[mirror_ubuntu-artful-kernel.git] / drivers / net / ethernet / mellanox / mlx4 / en_tx.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 8726a4aee5a7405c6d58518b2aa44bdb30b9f5cb..34c137878545fc672dad1a3d86e11c034c0ac368 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -392,7 +392,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
        if (!priv->port_up)
                return true;
 
-       prefetchw(&ring->tx_queue->dql.limit);
+       netdev_txq_bql_complete_prefetchw(ring->tx_queue);
+
        index = cons_index & size_mask;
        cqe = mlx4_en_get_cqe(buf, index, priv->cqe_size) + factor;
        last_nr_txbb = ACCESS_ONCE(ring->last_nr_txbb);
@@ -737,7 +738,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
                vlan_tag = vlan_tx_tag_get(skb);
 
 
-       prefetchw(&ring->tx_queue->dql);
+       netdev_txq_bql_enqueue_prefetchw(ring->tx_queue);
 
        /* Track current inflight packets for performance analysis */
        AVG_PERF_COUNTER(priv->pstats.inflight_avg,