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: Andy Gospodarek <gospo@broadcom.com>
Suggested-by: Tal Gilboa <talgi@mellanox.com>
Acked-by: Tal Gilboa <talgi@mellanox.com>
Acked-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
index a1c94fdc71742db61d0ece26771fd867d14ae698..f292bb346985b7a8a84fad690a6005452e1ae22f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
@@ -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,
-                       c->rq.stats.packets,
-                       c->rq.stats.bytes);
+       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,
+                              &dim_sample);
+               net_dim(&c->rq.dim, dim_sample);
+       }
 
        mlx5e_cq_arm(&c->rq.cq);
        mlx5e_cq_arm(&c->icosq.cq);

diff --git a/include/linux/net_dim.h b/include/linux/net_dim.h
index 741510fb74cb99aa61f1cc1cc1f44da005a3d83b..1c7e45016120ad88dccd90616267bd2510ac99f1 100644 (file)
--- a/include/linux/net_dim.h
+++ b/include/linux/net_dim.h
@@ -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: