Remove deprecated ``DEV_RX_OFFLOAD_*`` and ``DEV_TX_OFFLOAD_`` defines.
Use corresponding defines with ``RTE_ETH_RX_OFFLOAD_`` and
``RTE_ETH_TX_OFFLOAD_`` prefix instead.
Signed-off-by: Andrew Rybchenko <andrew.rybche...@oktetlabs.ru>
---
doc/guides/rel_notes/release_22_11.rst | 4 +++
lib/ethdev/rte_ethdev.h | 44 --------------------------
2 files changed, 4 insertions(+), 44 deletions(-)
diff --git a/doc/guides/rel_notes/release_22_11.rst
b/doc/guides/rel_notes/release_22_11.rst
index c9fa16ceb2..0bed31cbaa 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -95,6 +95,10 @@ API Changes
RETA size specification. Use corresponding defines with ``RTE_`` prefix
instead.
+* ethdev: Removed deprecated ``DEV_RX_OFFLOAD_*`` and ``DEV_TX_OFFLOAD_``
+ defines. Use corresponding defines with ``RTE_ETH_RX_OFFLOAD_`` and
+ ``RTE_ETH_TX_OFFLOAD_`` prefix instead.
+
ABI Changes
-----------
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index b27cc744be..3552535780 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -1491,34 +1491,13 @@ struct rte_eth_conf {
#define RTE_ETH_RX_OFFLOAD_RSS_HASH RTE_BIT64(19)
#define RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT RTE_BIT64(20)
-#define DEV_RX_OFFLOAD_VLAN_STRIP
RTE_DEPRECATED(DEV_RX_OFFLOAD_VLAN_STRIP) RTE_ETH_RX_OFFLOAD_VLAN_STRIP
-#define DEV_RX_OFFLOAD_IPV4_CKSUM
RTE_DEPRECATED(DEV_RX_OFFLOAD_IPV4_CKSUM) RTE_ETH_RX_OFFLOAD_IPV4_CKSUM
-#define DEV_RX_OFFLOAD_UDP_CKSUM
RTE_DEPRECATED(DEV_RX_OFFLOAD_UDP_CKSUM) RTE_ETH_RX_OFFLOAD_UDP_CKSUM
-#define DEV_RX_OFFLOAD_TCP_CKSUM
RTE_DEPRECATED(DEV_RX_OFFLOAD_TCP_CKSUM) RTE_ETH_RX_OFFLOAD_TCP_CKSUM
-#define DEV_RX_OFFLOAD_TCP_LRO RTE_DEPRECATED(DEV_RX_OFFLOAD_TCP_LRO)
RTE_ETH_RX_OFFLOAD_TCP_LRO
-#define DEV_RX_OFFLOAD_QINQ_STRIP
RTE_DEPRECATED(DEV_RX_OFFLOAD_QINQ_STRIP) RTE_ETH_RX_OFFLOAD_QINQ_STRIP
-#define DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM
RTE_DEPRECATED(DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM)
RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM
-#define DEV_RX_OFFLOAD_MACSEC_STRIP
RTE_DEPRECATED(DEV_RX_OFFLOAD_MACSEC_STRIP) RTE_ETH_RX_OFFLOAD_MACSEC_STRIP
-#define DEV_RX_OFFLOAD_HEADER_SPLIT
RTE_DEPRECATED(DEV_RX_OFFLOAD_HEADER_SPLIT) RTE_ETH_RX_OFFLOAD_HEADER_SPLIT
-#define DEV_RX_OFFLOAD_VLAN_FILTER
RTE_DEPRECATED(DEV_RX_OFFLOAD_VLAN_FILTER) RTE_ETH_RX_OFFLOAD_VLAN_FILTER
-#define DEV_RX_OFFLOAD_VLAN_EXTEND
RTE_DEPRECATED(DEV_RX_OFFLOAD_VLAN_EXTEND) RTE_ETH_RX_OFFLOAD_VLAN_EXTEND
-#define DEV_RX_OFFLOAD_SCATTER RTE_DEPRECATED(DEV_RX_OFFLOAD_SCATTER)
RTE_ETH_RX_OFFLOAD_SCATTER
-#define DEV_RX_OFFLOAD_TIMESTAMP
RTE_DEPRECATED(DEV_RX_OFFLOAD_TIMESTAMP) RTE_ETH_RX_OFFLOAD_TIMESTAMP
-#define DEV_RX_OFFLOAD_SECURITY
RTE_DEPRECATED(DEV_RX_OFFLOAD_SECURITY) RTE_ETH_RX_OFFLOAD_SECURITY
-#define DEV_RX_OFFLOAD_KEEP_CRC
RTE_DEPRECATED(DEV_RX_OFFLOAD_KEEP_CRC) RTE_ETH_RX_OFFLOAD_KEEP_CRC
-#define DEV_RX_OFFLOAD_SCTP_CKSUM
RTE_DEPRECATED(DEV_RX_OFFLOAD_SCTP_CKSUM) RTE_ETH_RX_OFFLOAD_SCTP_CKSUM
-#define DEV_RX_OFFLOAD_OUTER_UDP_CKSUM
RTE_DEPRECATED(DEV_RX_OFFLOAD_OUTER_UDP_CKSUM)
RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM
-#define DEV_RX_OFFLOAD_RSS_HASH
RTE_DEPRECATED(DEV_RX_OFFLOAD_RSS_HASH) RTE_ETH_RX_OFFLOAD_RSS_HASH
-
#define RTE_ETH_RX_OFFLOAD_CHECKSUM (RTE_ETH_RX_OFFLOAD_IPV4_CKSUM | \
RTE_ETH_RX_OFFLOAD_UDP_CKSUM | \
RTE_ETH_RX_OFFLOAD_TCP_CKSUM)
-#define DEV_RX_OFFLOAD_CHECKSUM RTE_DEPRECATED(DEV_RX_OFFLOAD_CHECKSUM)
RTE_ETH_RX_OFFLOAD_CHECKSUM
#define RTE_ETH_RX_OFFLOAD_VLAN (RTE_ETH_RX_OFFLOAD_VLAN_STRIP | \
RTE_ETH_RX_OFFLOAD_VLAN_FILTER | \
RTE_ETH_RX_OFFLOAD_VLAN_EXTEND | \
RTE_ETH_RX_OFFLOAD_QINQ_STRIP)
-#define DEV_RX_OFFLOAD_VLAN RTE_DEPRECATED(DEV_RX_OFFLOAD_VLAN)
RTE_ETH_RX_OFFLOAD_VLAN
/*
* If new Rx offload capabilities are defined, they also must be
@@ -1581,29 +1560,6 @@ struct rte_eth_conf {
* mentioned in rte_tx_offload_names in rte_ethdev.c file.
*/
-#define DEV_TX_OFFLOAD_VLAN_INSERT
RTE_DEPRECATED(DEV_TX_OFFLOAD_VLAN_INSERT) RTE_ETH_TX_OFFLOAD_VLAN_INSERT
-#define DEV_TX_OFFLOAD_IPV4_CKSUM
RTE_DEPRECATED(DEV_TX_OFFLOAD_IPV4_CKSUM) RTE_ETH_TX_OFFLOAD_IPV4_CKSUM
-#define DEV_TX_OFFLOAD_UDP_CKSUM
RTE_DEPRECATED(DEV_TX_OFFLOAD_UDP_CKSUM) RTE_ETH_TX_OFFLOAD_UDP_CKSUM
-#define DEV_TX_OFFLOAD_TCP_CKSUM
RTE_DEPRECATED(DEV_TX_OFFLOAD_TCP_CKSUM) RTE_ETH_TX_OFFLOAD_TCP_CKSUM
-#define DEV_TX_OFFLOAD_SCTP_CKSUM
RTE_DEPRECATED(DEV_TX_OFFLOAD_SCTP_CKSUM) RTE_ETH_TX_OFFLOAD_SCTP_CKSUM
-#define DEV_TX_OFFLOAD_TCP_TSO
RTE_DEPRECATED(DEV_TX_OFFLOAD_TCP_TSO) RTE_ETH_TX_OFFLOAD_TCP_TSO
-#define DEV_TX_OFFLOAD_UDP_TSO
RTE_DEPRECATED(DEV_TX_OFFLOAD_UDP_TSO) RTE_ETH_TX_OFFLOAD_UDP_TSO
-#define DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM
RTE_DEPRECATED(DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)
RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM
-#define DEV_TX_OFFLOAD_QINQ_INSERT
RTE_DEPRECATED(DEV_TX_OFFLOAD_QINQ_INSERT) RTE_ETH_TX_OFFLOAD_QINQ_INSERT
-#define DEV_TX_OFFLOAD_VXLAN_TNL_TSO
RTE_DEPRECATED(DEV_TX_OFFLOAD_VXLAN_TNL_TSO)
RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO
-#define DEV_TX_OFFLOAD_GRE_TNL_TSO
RTE_DEPRECATED(DEV_TX_OFFLOAD_GRE_TNL_TSO) RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO
-#define DEV_TX_OFFLOAD_IPIP_TNL_TSO
RTE_DEPRECATED(DEV_TX_OFFLOAD_IPIP_TNL_TSO) RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO
-#define DEV_TX_OFFLOAD_GENEVE_TNL_TSO
RTE_DEPRECATED(DEV_TX_OFFLOAD_GENEVE_TNL_TSO)
RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO
-#define DEV_TX_OFFLOAD_MACSEC_INSERT
RTE_DEPRECATED(DEV_TX_OFFLOAD_MACSEC_INSERT)
RTE_ETH_TX_OFFLOAD_MACSEC_INSERT
-#define DEV_TX_OFFLOAD_MT_LOCKFREE
RTE_DEPRECATED(DEV_TX_OFFLOAD_MT_LOCKFREE) RTE_ETH_TX_OFFLOAD_MT_LOCKFREE
-#define DEV_TX_OFFLOAD_MULTI_SEGS
RTE_DEPRECATED(DEV_TX_OFFLOAD_MULTI_SEGS) RTE_ETH_TX_OFFLOAD_MULTI_SEGS
-#define DEV_TX_OFFLOAD_MBUF_FAST_FREE
RTE_DEPRECATED(DEV_TX_OFFLOAD_MBUF_FAST_FREE)
RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE
-#define DEV_TX_OFFLOAD_SECURITY
RTE_DEPRECATED(DEV_TX_OFFLOAD_SECURITY) RTE_ETH_TX_OFFLOAD_SECURITY
-#define DEV_TX_OFFLOAD_UDP_TNL_TSO
RTE_DEPRECATED(DEV_TX_OFFLOAD_UDP_TNL_TSO) RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO
-#define DEV_TX_OFFLOAD_IP_TNL_TSO
RTE_DEPRECATED(DEV_TX_OFFLOAD_IP_TNL_TSO) RTE_ETH_TX_OFFLOAD_IP_TNL_TSO
-#define DEV_TX_OFFLOAD_OUTER_UDP_CKSUM
RTE_DEPRECATED(DEV_TX_OFFLOAD_OUTER_UDP_CKSUM)
RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM
-#define DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP
RTE_DEPRECATED(DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP)
RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP
-
/**@{@name Device capabilities
* Non-offload capabilities reported in rte_eth_dev_info.dev_capa.
*/
--
2.30.2
