[v5,1/2] ethdev: remove bonding deprecated macro

Message ID 20230816062710.2188087-2-chaoyong.he@corigine.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series replace master/slave to main/member |

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Chaoyong He Aug. 16, 2023, 6:27 a.m. UTC
  From: Long Wu <long.wu@corigine.com>

The macro RTE_ETH_DEV_BONDED_SLAVE was marked as deprecated in v23.07,
we can remove it.

Signed-off-by: Long Wu <long.wu@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
---
 doc/guides/rel_notes/deprecation.rst   | 5 +----
 doc/guides/rel_notes/release_23_11.rst | 2 ++
 lib/ethdev/rte_ethdev.h                | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)
  

Comments

lihuisong (C) Aug. 17, 2023, 2:28 a.m. UTC | #1
在 2023/8/16 14:27, Chaoyong He 写道:
> From: Long Wu <long.wu@corigine.com>
>
> The macro RTE_ETH_DEV_BONDED_SLAVE was marked as deprecated in v23.07,
> we can remove it.
>
> Signed-off-by: Long Wu <long.wu@corigine.com>
> Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
> ---
>   doc/guides/rel_notes/deprecation.rst   | 5 +----
>   doc/guides/rel_notes/release_23_11.rst | 2 ++
>   lib/ethdev/rte_ethdev.h                | 1 -
>   3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
> index 317875c505..82455f9e18 100644
> --- a/doc/guides/rel_notes/deprecation.rst
> +++ b/doc/guides/rel_notes/deprecation.rst
> @@ -124,10 +124,7 @@ Deprecation Notices
>     The legacy actions should be removed
>     once ``MODIFY_FIELD`` alternative is implemented in drivers.
>   
> -* bonding: The macro ``RTE_ETH_DEV_BONDED_SLAVE`` will be
> -  deprecated in DPDK 23.07, and removed in DPDK 23.11.
> -  The relevant code can be updated using ``RTE_ETH_DEV_BONDING_MEMBER``.
> -  The data structure ``struct rte_eth_bond_8023ad_slave_info`` will be
> +* bonding: The data structure ``struct rte_eth_bond_8023ad_slave_info`` will be
>     renamed to ``struct rte_eth_bond_8023ad_member_info`` in DPDK 23.11.
>     The following functions will be removed in DPDK 23.11.
>     The old functions:
> diff --git a/doc/guides/rel_notes/release_23_11.rst b/doc/guides/rel_notes/release_23_11.rst
> index 4411bb32c1..2fae9539e2 100644
> --- a/doc/guides/rel_notes/release_23_11.rst
> +++ b/doc/guides/rel_notes/release_23_11.rst
> @@ -87,6 +87,8 @@ Removed Items
>   
>   * eal: Removed deprecated ``RTE_FUNC_PTR_OR_*`` macros.
>   
> +* ethdev: Removed deprecated macro ``RTE_ETH_DEV_BONDED_SLAVE``.
> +
>   * flow_classify: Removed flow classification library and examples.
>   
>   * kni: Removed the Kernel Network Interface (KNI) library and driver.
> diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
> index 04a2564f22..a6bf7c16cf 100644
> --- a/lib/ethdev/rte_ethdev.h
> +++ b/lib/ethdev/rte_ethdev.h
> @@ -2038,7 +2038,6 @@ struct rte_eth_dev_owner {
>   #define RTE_ETH_DEV_INTR_LSC              RTE_BIT32(1)
>   /** Device is a bonding member */
>   #define RTE_ETH_DEV_BONDING_MEMBER        RTE_BIT32(2)
> -#define RTE_ETH_DEV_BONDED_SLAVE RTE_DEPRECATED(RTE_ETH_DEV_BONDED_SLAVE) RTE_ETH_DEV_BONDING_MEMBER
>   /** Device supports device removal interrupt */
>   #define RTE_ETH_DEV_INTR_RMV              RTE_BIT32(3)
>   /** Device is port representor */
Acked-by: Huisong Li <lihuisong@huawei.com>
  

Patch

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 317875c505..82455f9e18 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -124,10 +124,7 @@  Deprecation Notices
   The legacy actions should be removed
   once ``MODIFY_FIELD`` alternative is implemented in drivers.
 
-* bonding: The macro ``RTE_ETH_DEV_BONDED_SLAVE`` will be
-  deprecated in DPDK 23.07, and removed in DPDK 23.11.
-  The relevant code can be updated using ``RTE_ETH_DEV_BONDING_MEMBER``.
-  The data structure ``struct rte_eth_bond_8023ad_slave_info`` will be
+* bonding: The data structure ``struct rte_eth_bond_8023ad_slave_info`` will be
   renamed to ``struct rte_eth_bond_8023ad_member_info`` in DPDK 23.11.
   The following functions will be removed in DPDK 23.11.
   The old functions:
diff --git a/doc/guides/rel_notes/release_23_11.rst b/doc/guides/rel_notes/release_23_11.rst
index 4411bb32c1..2fae9539e2 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -87,6 +87,8 @@  Removed Items
 
 * eal: Removed deprecated ``RTE_FUNC_PTR_OR_*`` macros.
 
+* ethdev: Removed deprecated macro ``RTE_ETH_DEV_BONDED_SLAVE``.
+
 * flow_classify: Removed flow classification library and examples.
 
 * kni: Removed the Kernel Network Interface (KNI) library and driver.
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 04a2564f22..a6bf7c16cf 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -2038,7 +2038,6 @@  struct rte_eth_dev_owner {
 #define RTE_ETH_DEV_INTR_LSC              RTE_BIT32(1)
 /** Device is a bonding member */
 #define RTE_ETH_DEV_BONDING_MEMBER        RTE_BIT32(2)
-#define RTE_ETH_DEV_BONDED_SLAVE RTE_DEPRECATED(RTE_ETH_DEV_BONDED_SLAVE) RTE_ETH_DEV_BONDING_MEMBER
 /** Device supports device removal interrupt */
 #define RTE_ETH_DEV_INTR_RMV              RTE_BIT32(3)
 /** Device is port representor */