net/mlx5e: RX, Generalise function of SKB frag addition

Rename it and pass truesize as an extra argument, as it will be used also
in Legacy RQ in a downstream patch.

Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index 61a76faa2779494620457e5a2ebf03d790814902..546e3bc46cd10e19e2776341198d71c765f07ccc 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -311,13 +311,11 @@ void mlx5e_dealloc_rx_wqe(struct mlx5e_rq *rq, u16 ix)
                mlx5e_free_rx_wqe(rq, wi);
 }
 
-static inline void mlx5e_add_skb_frag_mpwqe(struct mlx5e_rq *rq,
-                                           struct sk_buff *skb,
-                                           struct mlx5e_dma_info *di,
-                                           u32 frag_offset, u32 len)
+static inline void
+mlx5e_add_skb_frag(struct mlx5e_rq *rq, struct sk_buff *skb,
+                  struct mlx5e_dma_info *di, u32 frag_offset, u32 len,
+                  unsigned int truesize)
 {
-       unsigned int truesize = ALIGN(len, BIT(rq->mpwqe.log_stride_sz));
-
        dma_sync_single_for_cpu(rq->pdev,
                                di->addr + frag_offset,
                                len, DMA_FROM_DEVICE);
@@ -1094,9 +1092,11 @@ mlx5e_skb_from_cqe_mpwrq_nonlinear(struct mlx5e_rq *rq, struct mlx5e_mpw_info *w
        while (byte_cnt) {
                u32 pg_consumed_bytes =
                        min_t(u32, PAGE_SIZE - frag_offset, byte_cnt);
+               unsigned int truesize =
+                       ALIGN(pg_consumed_bytes, BIT(rq->mpwqe.log_stride_sz));
 
-               mlx5e_add_skb_frag_mpwqe(rq, skb, di, frag_offset,
-                                        pg_consumed_bytes);
+               mlx5e_add_skb_frag(rq, skb, di, frag_offset,
+                                  pg_consumed_bytes, truesize);
                byte_cnt -= pg_consumed_bytes;
                frag_offset = 0;
                di++;