Merge tag 'irq-core-2020-12-23' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / net / ethernet / mellanox / mlx4 / en_rx.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 399459a..c1c9118 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -283,7 +283,7 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
        ring->log_stride = ffs(ring->stride) - 1;
        ring->buf_size = ring->size * ring->stride + TXBB_SIZE;
 
-       if (xdp_rxq_info_reg(&ring->xdp_rxq, priv->dev, queue_index) < 0)
+       if (xdp_rxq_info_reg(&ring->xdp_rxq, priv->dev, queue_index, 0) < 0)
                goto err_ring;
 
        tmp = size * roundup_pow_of_two(MLX4_EN_MAX_RX_FRAGS *
@@ -684,7 +684,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
        xdp_prog = rcu_dereference(ring->xdp_prog);
        xdp.rxq = &ring->xdp_rxq;
        xdp.frame_sz = priv->frag_info[0].frag_stride;
-       doorbell_pending = 0;
+       doorbell_pending = false;
 
        /* We assume a 1:1 mapping between CQEs and Rx descriptors, so Rx
         * descriptor offset can be deduced from the CQE index instead of
@@ -914,7 +914,6 @@ next:
                wmb(); /* ensure HW sees CQ consumer before we post new buffers */
                ring->cons = cq->mcq.cons_index;
        }
-       AVG_PERF_COUNTER(priv->pstats.rx_coal_avg, polled);
 
        mlx4_en_refill_rx_buffers(priv, ring);
 
@@ -964,8 +963,6 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget)
                /* in case we got here because of !clean_complete */
                done = budget;
 
-               INC_PERF_COUNTER(priv->pstats.napi_quota);
-
                cpu_curr = smp_processor_id();
 
                if (likely(cpumask_test_cpu(cpu_curr, cq->aff_mask)))