In order to support inclusive naming, the data structure of bonding 8023 info need to be renamed. Do this through deprecation process now for 23.07.
Signed-off-by: Chaoyong He <chaoyong...@corigine.com> --- doc/guides/rel_notes/deprecation.rst | 3 +++ drivers/net/bonding/rte_eth_bond_8023ad.c | 2 +- drivers/net/bonding/rte_eth_bond_8023ad.h | 4 ++-- drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index c9477dd0da..5b16b66267 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -165,3 +165,6 @@ Deprecation Notices * 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 + deprecated in DPDK 23.07, and removed in DPDK 23.11. The relevant code can be + updated using ``struct rte_eth_bond_8023ad_member_info``. diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index 4a266bb2ca..49f22ffab1 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -1518,7 +1518,7 @@ rte_eth_bond_8023ad_setup(uint16_t port_id, int rte_eth_bond_8023ad_slave_info(uint16_t port_id, uint16_t slave_id, - struct rte_eth_bond_8023ad_slave_info *info) + struct rte_eth_bond_8023ad_member_info *info) { struct rte_eth_dev *bond_dev; struct bond_dev_private *internals; diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h index 7ad8d6d00b..ab6d0182a9 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.h +++ b/drivers/net/bonding/rte_eth_bond_8023ad.h @@ -141,7 +141,7 @@ struct rte_eth_bond_8023ad_conf { enum rte_bond_8023ad_agg_selection agg_selection; }; -struct rte_eth_bond_8023ad_slave_info { +struct rte_eth_bond_8023ad_member_info { enum rte_bond_8023ad_selection selected; uint8_t actor_state; struct port_params actor; @@ -195,7 +195,7 @@ rte_eth_bond_8023ad_setup(uint16_t port_id, */ int rte_eth_bond_8023ad_slave_info(uint16_t port_id, uint16_t slave_id, - struct rte_eth_bond_8023ad_slave_info *conf); + struct rte_eth_bond_8023ad_member_info *conf); #ifdef __cplusplus } diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 73205f78f4..0a595d427c 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3471,7 +3471,7 @@ dump_lacp_port_param(const struct port_params *params, FILE *f) } static void -dump_lacp_slave(const struct rte_eth_bond_8023ad_slave_info *info, FILE *f) +dump_lacp_slave(const struct rte_eth_bond_8023ad_member_info *info, FILE *f) { char a_state[256] = { 0 }; char p_state[256] = { 0 }; @@ -3520,7 +3520,7 @@ dump_lacp_slave(const struct rte_eth_bond_8023ad_slave_info *info, FILE *f) static void dump_lacp(uint16_t port_id, FILE *f) { - struct rte_eth_bond_8023ad_slave_info slave_info; + struct rte_eth_bond_8023ad_member_info slave_info; struct rte_eth_bond_8023ad_conf port_conf; uint16_t slaves[RTE_MAX_ETHPORTS]; int num_active_slaves; -- 2.39.1