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

Commit 8115b750 authored by Andy Gospodarek's avatar Andy Gospodarek Committed by David S. Miller
Browse files

net/dim: use struct net_dim_sample as arg to net_dim 



Simplify the arguments net_dim() by formatting them into a struct
net_dim_sample before calling the function.

Signed-off-by: default avatarAndy Gospodarek <gospo@broadcom.com>
Suggested-by: default avatarTal Gilboa <talgi@mellanox.com>
Acked-by: default avatarTal Gilboa <talgi@mellanox.com>
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c4dbb4a

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

+8 −5
Original line number Diff line number Diff line
@@ -78,11 +78,14 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget) 
	for (i = 0; i < c->num_tc; i++)

		mlx5e_cq_arm(&c->sq[i].cq);



	if (MLX5E_TEST_BIT(c->rq.state, MLX5E_RQ_STATE_AM))

		net_dim(&c->rq.dim,

			c->rq.cq.event_ctr,

	if (MLX5E_TEST_BIT(c->rq.state, MLX5E_RQ_STATE_AM)) {

		struct net_dim_sample dim_sample;

		net_dim_sample(c->rq.cq.event_ctr,

			       c->rq.stats.packets,

			c->rq.stats.bytes);

			       c->rq.stats.bytes,

			       &dim_sample);

		net_dim(&c->rq.dim, dim_sample);

	}



	mlx5e_cq_arm(&c->rq.cq);

	mlx5e_cq_arm(&c->icosq.cq);

include/linux/net_dim.h

+3 −7
Original line number Diff line number Diff line
@@ -342,21 +342,18 @@ static inline void net_dim_calc_stats(struct net_dim_sample *start, 
}



static inline void net_dim(struct net_dim *dim,

			   u16 event_ctr,

			   u64 packets,

			   u64 bytes)

			   struct net_dim_sample end_sample)

{

	struct net_dim_sample end_sample;

	struct net_dim_stats curr_stats;

	u16 nevents;



	switch (dim->state) {

	case NET_DIM_MEASURE_IN_PROGRESS:

		nevents = BIT_GAP(BITS_PER_TYPE(u16), event_ctr,

		nevents = BIT_GAP(BITS_PER_TYPE(u16),

				  end_sample.event_ctr,

				  dim->start_sample.event_ctr);

		if (nevents < NET_DIM_NEVENTS)

			break;

		net_dim_sample(event_ctr, packets, bytes, &end_sample);

		net_dim_calc_stats(&dim->start_sample, &end_sample,

				   &curr_stats);

		if (net_dim_decision(&curr_stats, dim)) {
@@ -366,7 +363,6 @@ static inline void net_dim(struct net_dim *dim, 
		}

		/* fall through */

	case NET_DIM_START_MEASURE:

		net_dim_sample(event_ctr, packets, bytes, &dim->start_sample);

		dim->state = NET_DIM_MEASURE_IN_PROGRESS;

		break;

	case NET_DIM_APPLY_NEW_PROFILE: