update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/spdk/dpdk/drivers/net/thunderx/nicvf_rxtx.h b/ceph/src/spdk/dpdk/drivers/net/thunderx/nicvf_rxtx.h
index a39808cb6bb0a4c07129e267fc8daad4d8e10870..1f274b29546fa1f1c5c3a4394f0379e76f5d94c1 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/net/thunderx/nicvf_rxtx.h
+++ b/ceph/src/spdk/dpdk/drivers/net/thunderx/nicvf_rxtx.h
@@ -14,10 +14,6 @@
 
 #define NICVF_TX_OFFLOAD_MASK (PKT_TX_IP_CKSUM | PKT_TX_L4_MASK)
 
-#ifndef __hot
-#define __hot  __attribute__((hot))
-#endif
-
 #if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
 static inline uint16_t __attribute__((const))
 nicvf_frag_num(uint16_t i)
@@ -25,7 +21,7 @@ nicvf_frag_num(uint16_t i)
        return (i & ~3) + 3 - (i & 3);
 }
 
-static inline void __hot
+static inline void __rte_hot
 fill_sq_desc_gather(union sq_entry_t *entry, struct rte_mbuf *pkt)
 {
        /* Local variable sqe to avoid read from sq desc memory*/
@@ -50,7 +46,7 @@ nicvf_frag_num(uint16_t i)
        return i;
 }
 
-static inline void __hot
+static inline void __rte_hot
 fill_sq_desc_gather(union sq_entry_t *entry, struct rte_mbuf *pkt)
 {
        entry->buff[0] = (uint64_t)SQ_DESC_TYPE_GATHER << 60 |