net/mlx5e: Take TX WQE info structures out of general EN header

Into the txrx header file.
The mlx5e_sq_wqe_info structure describes WQE info for the ICOSQ,
rename it to better reflect this.

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

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index da7fe6aafeed1620fef72aa3fafd6759c719e680..3bd64c63865b905882ea483cf734477218294119 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -339,16 +339,6 @@ struct mlx5e_cq_decomp {
        u16                        wqe_counter;
 } ____cacheline_aligned_in_smp;
 
-struct mlx5e_tx_wqe_info {
-       struct sk_buff *skb;
-       u32 num_bytes;
-       u8  num_wqebbs;
-       u8  num_dma;
-#ifdef CONFIG_MLX5_EN_TLS
-       struct page *resync_dump_frag_page;
-#endif
-};
-
 enum mlx5e_dma_map_type {
        MLX5E_DMA_MAP_SINGLE,
        MLX5E_DMA_MAP_PAGE
@@ -370,18 +360,6 @@ enum {
        MLX5E_SQ_STATE_PENDING_XSK_TX,
 };
 
-struct mlx5e_icosq_wqe_info {
-       u8  opcode;
-       u8 num_wqebbs;
-
-       /* Auxiliary data for different opcodes. */
-       union {
-               struct {
-                       struct mlx5e_rq *rq;
-               } umr;
-       };
-};
-
 struct mlx5e_txqsq {
        /* data path */
 
@@ -484,11 +462,6 @@ struct mlx5e_xdp_info_fifo {
        u32 mask;
 };
 
-struct mlx5e_xdp_wqe_info {
-       u8 num_wqebbs;
-       u8 num_pkts;
-};
-
 struct mlx5e_xdp_mpwqe {
        /* Current MPWQE session */
        struct mlx5e_tx_wqe *wqe;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
index 89fe65593c1621f8e466a69d59181fc915d8afa3..9e150d160cdecb4cb012efa765d895bca4a1f524 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
@@ -81,6 +81,16 @@ mlx5e_post_nop_fence(struct mlx5_wq_cyc *wq, u32 sqn, u16 *pc)
        return wqe;
 }
 
+struct mlx5e_tx_wqe_info {
+       struct sk_buff *skb;
+       u32 num_bytes;
+       u8 num_wqebbs;
+       u8 num_dma;
+#ifdef CONFIG_MLX5_EN_TLS
+       struct page *resync_dump_frag_page;
+#endif
+};
+
 static inline u16 mlx5e_txqsq_get_next_pi(struct mlx5e_txqsq *sq, u16 size)
 {
        struct mlx5_wq_cyc *wq = &sq->wq;
@@ -109,6 +119,18 @@ static inline u16 mlx5e_txqsq_get_next_pi(struct mlx5e_txqsq *sq, u16 size)
        return pi;
 }
 
+struct mlx5e_icosq_wqe_info {
+       u8 opcode;
+       u8 num_wqebbs;
+
+       /* Auxiliary data for different opcodes. */
+       union {
+               struct {
+                       struct mlx5e_rq *rq;
+               } umr;
+       };
+};
+
 static inline u16 mlx5e_icosq_get_next_pi(struct mlx5e_icosq *sq, u16 size)
 {
        struct mlx5_wq_cyc *wq = &sq->wq;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h
index ed6f045febeb1a1ff45b7be182b0ebd3ea8ebae7..e2e01f064c1ee89c365beaf22e3a96e059e837f5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h
@@ -137,6 +137,11 @@ mlx5e_xdp_no_room_for_inline_pkt(struct mlx5e_xdp_mpwqe *session)
               session->ds_count + MLX5E_XDP_INLINE_WQE_MAX_DS_CNT > MLX5E_XDP_MPW_MAX_NUM_DS;
 }
 
+struct mlx5e_xdp_wqe_info {
+       u8 num_wqebbs;
+       u8 num_pkts;
+};
+
 static inline void
 mlx5e_xdp_mpwqe_add_dseg(struct mlx5e_xdpsq *sq,
                         struct mlx5e_xdp_xmit_data *xdptxd,