Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...

[sfrench/cifs-2.6.git] / drivers / net / ethernet / mellanox / mlx5 / core / en_txrx.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
index c665ae0f22bd340043e01281dba9ab2918c5fc7f..1c021a299baa48208b0d4329a596035294e0d1a4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
@@ -48,26 +48,24 @@ static inline bool mlx5e_channel_no_affinity_change(struct mlx5e_channel *c)
 static void mlx5e_handle_tx_dim(struct mlx5e_txqsq *sq)
 {
        struct mlx5e_sq_stats *stats = sq->stats;
-       struct net_dim_sample dim_sample;
+       struct dim_sample dim_sample;
 
        if (unlikely(!test_bit(MLX5E_SQ_STATE_AM, &sq->state)))
                return;
 
-       net_dim_sample(sq->cq.event_ctr, stats->packets, stats->bytes,
-                      &dim_sample);
+       dim_update_sample(sq->cq.event_ctr, stats->packets, stats->bytes, &dim_sample);
        net_dim(&sq->dim, dim_sample);
 }
 
 static void mlx5e_handle_rx_dim(struct mlx5e_rq *rq)
 {
        struct mlx5e_rq_stats *stats = rq->stats;
-       struct net_dim_sample dim_sample;
+       struct dim_sample dim_sample;
 
        if (unlikely(!test_bit(MLX5E_RQ_STATE_AM, &rq->state)))
                return;
 
-       net_dim_sample(rq->cq.event_ctr, stats->packets, stats->bytes,
-                      &dim_sample);
+       dim_update_sample(rq->cq.event_ctr, stats->packets, stats->bytes, &dim_sample);
        net_dim(&rq->dim, dim_sample);
 }