net: add rte prefix to ether defines

[dpdk.git] / drivers / net / mlx5 / mlx5_rxtx_vec_neon.h

diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
index 883fe1b..b2cc710 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
+++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
@@ -104,6 +104,8 @@ txq_scatter_v(struct mlx5_txq_data *txq, struct rte_mbuf **pkts,
                sizeof(struct mlx5_wqe) / MLX5_WQE_DWORD_SIZE;
        unsigned int n;
        volatile struct mlx5_wqe *wqe = NULL;
+       bool metadata_ol =
+               txq->offloads & DEV_TX_OFFLOAD_MATCH_METADATA ? true : false;
 
        assert(elts_n > pkts_n);
        mlx5_tx_complete(txq);
@@ -127,6 +129,9 @@ txq_scatter_v(struct mlx5_txq_data *txq, struct rte_mbuf **pkts,
                uint8x16_t *t_wqe;
                uint8_t *dseg;
                uint8x16_t ctrl;
+               rte_be32_t metadata =
+                       metadata_ol && (buf->ol_flags & PKT_TX_METADATA) ?
+                       buf->tx_metadata : 0;
 
                assert(segs_n);
                max_elts = elts_n - (elts_head - txq->elts_tail);
@@ -164,9 +169,10 @@ txq_scatter_v(struct mlx5_txq_data *txq, struct rte_mbuf **pkts,
                ctrl = vqtbl1q_u8(ctrl, ctrl_shuf_m);
                vst1q_u8((void *)t_wqe, ctrl);
                /* Fill ESEG in the header. */
-               vst1q_u16((void *)(t_wqe + 1),
-                         ((uint16x8_t) { 0, 0, cs_flags, rte_cpu_to_be_16(len),
-                                         0, 0, 0, 0 }));
+               vst1q_u32((void *)(t_wqe + 1),
+                         ((uint32x4_t){ 0,
+                                        cs_flags << 16 | rte_cpu_to_be_16(len),
+                                        metadata, 0 }));
                txq->wqe_ci = wqe_ci;
        }
        if (!n)
@@ -373,7 +379,7 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
        };
        /* Restore the compressed count. Must be 16 bits. */
        const uint16_t mcqe_n = t_pkt->data_len +
-                               (rxq->crc_present * ETHER_CRC_LEN);
+                               (rxq->crc_present * RTE_ETHER_CRC_LEN);
        const uint64x2_t rearm =
                vld1q_u64((void *)&t_pkt->rearm_data);
        const uint32x4_t rxdf_mask = {
@@ -387,8 +393,8 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
                         vreinterpretq_u8_u32(rxdf_mask));
        const uint16x8_t crc_adj = {
                0, 0,
-               rxq->crc_present * ETHER_CRC_LEN, 0,
-               rxq->crc_present * ETHER_CRC_LEN, 0,
+               rxq->crc_present * RTE_ETHER_CRC_LEN, 0,
+               rxq->crc_present * RTE_ETHER_CRC_LEN, 0,
                0, 0
        };
        const uint32_t flow_tag = t_pkt->hash.fdir.hi;
@@ -711,7 +717,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n,
                12, 13, 14, -1  /* 1st CQE */
        };
        const uint16x8_t crc_adj = {
-               0, 0, rxq->crc_present * ETHER_CRC_LEN, 0, 0, 0, 0, 0
+               0, 0, rxq->crc_present * RTE_ETHER_CRC_LEN, 0, 0, 0, 0, 0
        };
        const uint32x4_t flow_mark_adj = { 0, 0, 0, rxq->mark * (-1) };