update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / app / test-pmd / macswap_neon.h

diff --git a/ceph/src/spdk/dpdk/app/test-pmd/macswap_neon.h b/ceph/src/spdk/dpdk/app/test-pmd/macswap_neon.h
index bdf416aa262818b99c3fd1082ae1a392f6157c3d..df6c260cd455da381f46f3bfccff0ab5576c152a 100644 (file)
--- a/ceph/src/spdk/dpdk/app/test-pmd/macswap_neon.h
+++ b/ceph/src/spdk/dpdk/app/test-pmd/macswap_neon.h
@@ -16,7 +16,7 @@ static inline void
 do_macswap(struct rte_mbuf *pkts[], uint16_t nb,
                struct rte_port *txp)
 {
-       struct ether_hdr *eth_hdr[4];
+       struct rte_ether_hdr *eth_hdr[4];
        struct rte_mbuf *mb[4];
        uint64_t ol_flags;
        int i;
@@ -46,16 +46,16 @@ do_macswap(struct rte_mbuf *pkts[], uint16_t nb,
                }
 
                mb[0] = pkts[i++];
-               eth_hdr[0] = rte_pktmbuf_mtod(mb[0], struct ether_hdr *);
+               eth_hdr[0] = rte_pktmbuf_mtod(mb[0], struct rte_ether_hdr *);
 
                mb[1] = pkts[i++];
-               eth_hdr[1] = rte_pktmbuf_mtod(mb[1], struct ether_hdr *);
+               eth_hdr[1] = rte_pktmbuf_mtod(mb[1], struct rte_ether_hdr *);
 
                mb[2] = pkts[i++];
-               eth_hdr[2] = rte_pktmbuf_mtod(mb[2], struct ether_hdr *);
+               eth_hdr[2] = rte_pktmbuf_mtod(mb[2], struct rte_ether_hdr *);
 
                mb[3] = pkts[i++];
-               eth_hdr[3] = rte_pktmbuf_mtod(mb[3], struct ether_hdr *);
+               eth_hdr[3] = rte_pktmbuf_mtod(mb[3], struct rte_ether_hdr *);
 
                v0 = vld1q_u8((uint8_t const *)eth_hdr[0]);
                v1 = vld1q_u8((uint8_t const *)eth_hdr[1]);
@@ -83,7 +83,7 @@ do_macswap(struct rte_mbuf *pkts[], uint16_t nb,
                if (i < nb - 1)
                        rte_prefetch0(rte_pktmbuf_mtod(pkts[i+1], void *));
                mb[0] = pkts[i];
-               eth_hdr[0] = rte_pktmbuf_mtod(mb[0], struct ether_hdr *);
+               eth_hdr[0] = rte_pktmbuf_mtod(mb[0], struct rte_ether_hdr *);
 
                /* Swap dest and src mac addresses. */
                v0 = vld1q_u8((uint8_t const *)eth_hdr[0]);