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: Tal Gilboa <talgi@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index b5e2f9d2cb713413be7f279fadb98d2978f5d755..faaf8ade15e5b4af376ebbfa75f6d72ebcb3ddb0 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1019,8 +1019,8 @@ 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,
-                              priv->dim.bytes, &dim_sample);
+               net_dim_update_sample(priv->dim.event_ctr, priv->dim.packets,
+                                     priv->dim.bytes, &dim_sample);
                net_dim(&priv->dim.dim, dim_sample);
        }
 

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 49de873043c0a2d99edb58f9a9ff5dc36359b0b0..eaec949c367a16f886aee88b45fac6e1ac1ba9d0 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -2130,10 +2130,10 @@ 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,
-                              cpr->rx_packets,
-                              cpr->rx_bytes,
-                              &dim_sample);
+               net_dim_update_sample(cpr->event_ctr,
+                                     cpr->rx_packets,
+                                     cpr->rx_bytes,
+                                     &dim_sample);
                net_dim(&cpr->dim, dim_sample);
        }
        return work_done;

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 5286a46ecfb0ff4216f3d154b11992088ab71413..297ae786ffed79cf22fe4551beade01b57d5f168 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1909,8 +1909,8 @@ 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,
-                              ring->dim.bytes, &dim_sample);
+               net_dim_update_sample(ring->dim.event_ctr, ring->dim.packets,
+                                     ring->dim.bytes, &dim_sample);
                net_dim(&ring->dim.dim, dim_sample);
        }
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
index f9862bf75491bb6da0be989bcd15414ab59ee8c2..07432e6428cfac6128656cda08144a01fc1ae692 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
@@ -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);
 }
 

diff --git a/include/linux/dim.h b/include/linux/dim.h
index 989dbbdf9d4593ea89d9e6cdaad536c7f8b53872..f0f20ed25497902a4f5856420c222c92c08e63df 100644 (file)
--- a/include/linux/dim.h
+++ b/include/linux/dim.h
@@ -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;

diff --git a/include/linux/net_dim.h b/include/linux/net_dim.h
index e0c97f824dd05d7c99056fc24ded69f2d6b2e283..d4b40adc7fa197c0c33bfe20d6081bb528a41fa6 100644 (file)
--- a/include/linux/net_dim.h
+++ b/include/linux/net_dim.h
@@ -261,8 +261,8 @@ static inline void net_dim(struct net_dim *dim,
                }
                /* fall through */
        case DIM_START_MEASURE:
-               net_dim_sample(end_sample.event_ctr, end_sample.pkt_ctr, end_sample.byte_ctr,
-                              &dim->start_sample);
+               net_dim_update_sample(end_sample.event_ctr, end_sample.pkt_ctr,
+                                     end_sample.byte_ctr, &dim->start_sample);
                dim->state = DIM_MEASURE_IN_PROGRESS;
                break;
        case DIM_APPLY_NEW_PROFILE: