MEMPOOL_HEADER_SIZE() is removed. The replacement with RTE_ prefix is internal only since it is implementation details which are not required in applications.
Signed-off-by: Andrew Rybchenko <andrew.rybche...@oktetlabs.ru> --- doc/guides/rel_notes/deprecation.rst | 4 ---- doc/guides/rel_notes/release_22_11.rst | 3 +++ lib/mempool/rte_mempool.h | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index e7583cae4c..5036ae845e 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -32,10 +32,6 @@ Deprecation Notices ``__atomic_thread_fence`` must be used for patches that need to be merged in 20.08 onwards. This change will not introduce any performance degradation. -* mempool: Helper macro ``MEMPOOL_HEADER_SIZE()`` is deprecated and will - be removed in DPDK 22.11. The replacement macro - ``RTE_MEMPOOL_HEADER_SIZE()`` is internal only. - * mempool: Macro to register mempool driver ``MEMPOOL_REGISTER_OPS()`` is deprecated and will be removed in DPDK 22.11. Use replacement macro ``RTE_MEMPOOL_REGISTER_OPS()``. diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 8c021cf050..ae72610093 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -84,6 +84,9 @@ API Changes Also, make sure to start the actual text at the margin. ======================================================= +* mempool: Deprecated helper macro ``MEMPOOL_HEADER_SIZE()`` is removed. + The replacement macro ``RTE_MEMPOOL_HEADER_SIZE()`` is internal only. + ABI Changes ----------- diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h index 3ada37cb86..e129a5a59d 100644 --- a/lib/mempool/rte_mempool.h +++ b/lib/mempool/rte_mempool.h @@ -329,10 +329,6 @@ struct rte_mempool { (sizeof(*(mp)) + (((cs) == 0) ? 0 : \ (sizeof(struct rte_mempool_cache) * RTE_MAX_LCORE))) -/** Deprecated. Use RTE_MEMPOOL_HEADER_SIZE() for internal purposes only. */ -#define MEMPOOL_HEADER_SIZE(mp, cs) \ - RTE_DEPRECATED(MEMPOOL_HEADER_SIZE) RTE_MEMPOOL_HEADER_SIZE(mp, cs) - /* return the header of a mempool object (internal) */ static inline struct rte_mempool_objhdr * rte_mempool_get_header(void *obj) -- 2.30.2