Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5b6ab02 authored by Tal Gilboa's avatar Tal Gilboa Committed by Saeed Mahameed
Browse files

linux/dim: Rename net_dim_sample() to net_dim_update_sample() 



In order to avoid confusion between the function and the similarly
named struct.
In preparation for removing the 'net' prefix from dim members.

Signed-off-by: default avatarTal Gilboa <talgi@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent c002bd52

drivers/net/ethernet/broadcom/bcmsysport.c

+2 −2
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ static int bcm_sysport_poll(struct napi_struct *napi, int budget) 
	}



	if (priv->dim.use_dim) {

		net_dim_sample(priv->dim.event_ctr, priv->dim.packets,

		net_dim_update_sample(priv->dim.event_ctr, priv->dim.packets,

				      priv->dim.bytes, &dim_sample);

		net_dim(&priv->dim.dim, dim_sample);

	}

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+4 −4
Original line number Diff line number Diff line
@@ -2130,7 +2130,7 @@ static int bnxt_poll(struct napi_struct *napi, int budget) 
	if (bp->flags & BNXT_FLAG_DIM) {

		struct net_dim_sample dim_sample;



		net_dim_sample(cpr->event_ctr,

		net_dim_update_sample(cpr->event_ctr,

				      cpr->rx_packets,

				      cpr->rx_bytes,

				      &dim_sample);

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+2 −2
Original line number Diff line number Diff line
@@ -1909,7 +1909,7 @@ static int bcmgenet_rx_poll(struct napi_struct *napi, int budget) 
	}



	if (ring->dim.use_dim) {

		net_dim_sample(ring->dim.event_ctr, ring->dim.packets,

		net_dim_update_sample(ring->dim.event_ctr, ring->dim.packets,

				      ring->dim.bytes, &dim_sample);

		net_dim(&ring->dim.dim, dim_sample);

	}

drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c

+2 −4
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ static void mlx5e_handle_tx_dim(struct mlx5e_txqsq *sq) 
	if (unlikely(!test_bit(MLX5E_SQ_STATE_AM, &sq->state)))

		return;



	net_dim_sample(sq->cq.event_ctr, stats->packets, stats->bytes,

		       &dim_sample);

	net_dim_update_sample(sq->cq.event_ctr, stats->packets, stats->bytes, &dim_sample);

	net_dim(&sq->dim, dim_sample);

}
@@ -66,8 +65,7 @@ static void mlx5e_handle_rx_dim(struct mlx5e_rq *rq) 
	if (unlikely(!test_bit(MLX5E_RQ_STATE_AM, &rq->state)))

		return;



	net_dim_sample(rq->cq.event_ctr, stats->packets, stats->bytes,

		       &dim_sample);

	net_dim_update_sample(rq->cq.event_ctr, stats->packets, stats->bytes, &dim_sample);

	net_dim(&rq->dim, dim_sample);

}

include/linux/dim.h

+2 −1
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ static inline void dim_park_tired(struct net_dim *dim) 
}



static inline void

net_dim_sample(u16 event_ctr, u64 packets, u64 bytes, struct net_dim_sample *s)

net_dim_update_sample(u16 event_ctr, u64 packets, u64 bytes,

		      struct net_dim_sample *s)

{

	s->time	     = ktime_get();

	s->pkt_ctr   = packets;