update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / drivers / net / thunderx / nicvf_struct.h

diff --git a/ceph/src/spdk/dpdk/drivers/net/thunderx/nicvf_struct.h b/ceph/src/spdk/dpdk/drivers/net/thunderx/nicvf_struct.h
index dd52f38e5c7927a3d1bb89395934688df107b1c3..cf1c281a0618ced29410f87bcbdba82b85bb4b2e 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/net/thunderx/nicvf_struct.h
+++ b/ceph/src/spdk/dpdk/drivers/net/thunderx/nicvf_struct.h
@@ -55,7 +55,7 @@ union mbuf_initializer {
 };
 
 struct nicvf_rxq {
-       MARKER rxq_fastpath_data_start;
+       RTE_MARKER rxq_fastpath_data_start;
        uint8_t  rbptr_offset;
        uint16_t rx_free_thresh;
        uint32_t head;
@@ -69,7 +69,7 @@ struct nicvf_rxq {
        struct rte_mempool *pool;
        union cq_entry_t *desc;
        union mbuf_initializer mbuf_initializer;
-       MARKER rxq_fastpath_data_end;
+       RTE_MARKER rxq_fastpath_data_end;
        uint8_t rx_drop_en;
        uint16_t precharge_cnt;
        uint16_t port_id;
@@ -105,7 +105,7 @@ struct nicvf {
        uint16_t mtu;
        int skip_bytes;
        bool vlan_filter_en;
-       uint8_t mac_addr[ETHER_ADDR_LEN];
+       uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
        /* secondary queue set support */
        uint8_t sqs_id;
        uint8_t sqs_count;