Remove deprecated ``ETH_LINK_SPEED_``, ``ETH_SPEED_NUM_`` and
``ETH_LINK_`` defines. Use corresponding defines with ``RTE_`` 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 | 41 --------------------------
2 files changed, 4 insertions(+), 41 deletions(-)
diff --git a/doc/guides/rel_notes/release_22_11.rst
b/doc/guides/rel_notes/release_22_11.rst
index 8c021cf050..e5f9115c50 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -84,6 +84,10 @@ API Changes
Also, make sure to start the actual text at the margin.
=======================================================
+* ethdev: Removed deprecated ``ETH_LINK_SPEED_*``, ``ETH_SPEED_NUM_*`` and
+ ``ETH_LINK_*`` (duplex-related) defines. Use corresponding defines
+ with ``RTE_`` prefix instead.
+
ABI Changes
-----------
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index de9e970d4d..0acaac0762 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -305,24 +305,6 @@ struct rte_eth_stats {
#define RTE_ETH_LINK_SPEED_200G RTE_BIT32(15) /**< 200 Gbps */
/**@}*/
-#define ETH_LINK_SPEED_AUTONEG RTE_DEPRECATED(ETH_LINK_SPEED_AUTONEG)
RTE_ETH_LINK_SPEED_AUTONEG
-#define ETH_LINK_SPEED_FIXED RTE_DEPRECATED(ETH_LINK_SPEED_FIXED)
RTE_ETH_LINK_SPEED_FIXED
-#define ETH_LINK_SPEED_10M_HD RTE_DEPRECATED(ETH_LINK_SPEED_10M_HD)
RTE_ETH_LINK_SPEED_10M_HD
-#define ETH_LINK_SPEED_10M RTE_DEPRECATED(ETH_LINK_SPEED_10M)
RTE_ETH_LINK_SPEED_10M
-#define ETH_LINK_SPEED_100M_HD RTE_DEPRECATED(ETH_LINK_SPEED_100M_HD)
RTE_ETH_LINK_SPEED_100M_HD
-#define ETH_LINK_SPEED_100M RTE_DEPRECATED(ETH_LINK_SPEED_100M)
RTE_ETH_LINK_SPEED_100M
-#define ETH_LINK_SPEED_1G RTE_DEPRECATED(ETH_LINK_SPEED_1G)
RTE_ETH_LINK_SPEED_1G
-#define ETH_LINK_SPEED_2_5G RTE_DEPRECATED(ETH_LINK_SPEED_2_5G)
RTE_ETH_LINK_SPEED_2_5G
-#define ETH_LINK_SPEED_5G RTE_DEPRECATED(ETH_LINK_SPEED_5G)
RTE_ETH_LINK_SPEED_5G
-#define ETH_LINK_SPEED_10G RTE_DEPRECATED(ETH_LINK_SPEED_10G)
RTE_ETH_LINK_SPEED_10G
-#define ETH_LINK_SPEED_20G RTE_DEPRECATED(ETH_LINK_SPEED_20G)
RTE_ETH_LINK_SPEED_20G
-#define ETH_LINK_SPEED_25G RTE_DEPRECATED(ETH_LINK_SPEED_25G)
RTE_ETH_LINK_SPEED_25G
-#define ETH_LINK_SPEED_40G RTE_DEPRECATED(ETH_LINK_SPEED_40G)
RTE_ETH_LINK_SPEED_40G
-#define ETH_LINK_SPEED_50G RTE_DEPRECATED(ETH_LINK_SPEED_50G)
RTE_ETH_LINK_SPEED_50G
-#define ETH_LINK_SPEED_56G RTE_DEPRECATED(ETH_LINK_SPEED_56G)
RTE_ETH_LINK_SPEED_56G
-#define ETH_LINK_SPEED_100G RTE_DEPRECATED(ETH_LINK_SPEED_100G)
RTE_ETH_LINK_SPEED_100G
-#define ETH_LINK_SPEED_200G RTE_DEPRECATED(ETH_LINK_SPEED_200G)
RTE_ETH_LINK_SPEED_200G
-
/**@{@name Link speed
* Ethernet numeric link speeds in Mbps
*/
@@ -343,22 +325,6 @@ struct rte_eth_stats {
#define RTE_ETH_SPEED_NUM_UNKNOWN UINT32_MAX /**< Unknown */
/**@}*/
-#define ETH_SPEED_NUM_NONE RTE_DEPRECATED(ETH_SPEED_NUM_NONE)
RTE_ETH_SPEED_NUM_NONE
-#define ETH_SPEED_NUM_10M RTE_DEPRECATED(ETH_SPEED_NUM_10M)
RTE_ETH_SPEED_NUM_10M
-#define ETH_SPEED_NUM_100M RTE_DEPRECATED(ETH_SPEED_NUM_100M)
RTE_ETH_SPEED_NUM_100M
-#define ETH_SPEED_NUM_1G RTE_DEPRECATED(ETH_SPEED_NUM_1G)
RTE_ETH_SPEED_NUM_1G
-#define ETH_SPEED_NUM_2_5G RTE_DEPRECATED(ETH_SPEED_NUM_2_5G)
RTE_ETH_SPEED_NUM_2_5G
-#define ETH_SPEED_NUM_5G RTE_DEPRECATED(ETH_SPEED_NUM_5G)
RTE_ETH_SPEED_NUM_5G
-#define ETH_SPEED_NUM_10G RTE_DEPRECATED(ETH_SPEED_NUM_10G)
RTE_ETH_SPEED_NUM_10G
-#define ETH_SPEED_NUM_20G RTE_DEPRECATED(ETH_SPEED_NUM_20G)
RTE_ETH_SPEED_NUM_20G
-#define ETH_SPEED_NUM_25G RTE_DEPRECATED(ETH_SPEED_NUM_25G)
RTE_ETH_SPEED_NUM_25G
-#define ETH_SPEED_NUM_40G RTE_DEPRECATED(ETH_SPEED_NUM_40G)
RTE_ETH_SPEED_NUM_40G
-#define ETH_SPEED_NUM_50G RTE_DEPRECATED(ETH_SPEED_NUM_50G)
RTE_ETH_SPEED_NUM_50G
-#define ETH_SPEED_NUM_56G RTE_DEPRECATED(ETH_SPEED_NUM_56G)
RTE_ETH_SPEED_NUM_56G
-#define ETH_SPEED_NUM_100G RTE_DEPRECATED(ETH_SPEED_NUM_100G)
RTE_ETH_SPEED_NUM_100G
-#define ETH_SPEED_NUM_200G RTE_DEPRECATED(ETH_SPEED_NUM_200G)
RTE_ETH_SPEED_NUM_200G
-#define ETH_SPEED_NUM_UNKNOWN RTE_DEPRECATED(ETH_SPEED_NUM_UNKNOWN)
RTE_ETH_SPEED_NUM_UNKNOWN
-
/**
* A structure used to retrieve link-level information of an Ethernet port.
*/
@@ -382,13 +348,6 @@ struct rte_eth_link {
#define RTE_ETH_LINK_MAX_STR_LEN 40 /**< Max length of default link string. */
/**@}*/
-#define ETH_LINK_HALF_DUPLEX RTE_DEPRECATED(ETH_LINK_HALF_DUPLEX)
RTE_ETH_LINK_HALF_DUPLEX
-#define ETH_LINK_FULL_DUPLEX RTE_DEPRECATED(ETH_LINK_FULL_DUPLEX)
RTE_ETH_LINK_FULL_DUPLEX
-#define ETH_LINK_DOWN RTE_DEPRECATED(ETH_LINK_DOWN)
RTE_ETH_LINK_DOWN
-#define ETH_LINK_UP RTE_DEPRECATED(ETH_LINK_UP)
RTE_ETH_LINK_UP
-#define ETH_LINK_FIXED RTE_DEPRECATED(ETH_LINK_FIXED)
RTE_ETH_LINK_FIXED
-#define ETH_LINK_AUTONEG RTE_DEPRECATED(ETH_LINK_AUTONEG)
RTE_ETH_LINK_AUTONEG
-
/**
* A structure used to configure the ring threshold registers of an Rx/Tx
* queue for an Ethernet port.
--
2.30.2
