This patch checks the return value of function rte_eth_bond_8023ad_agg_selection_set() in bond_ethdev_configure for error return value. Signed-off-by: Lee Daly <lee.daly@intel.com> --- drivers/net/bonding/rte_eth_bond_pmd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 156f31c..a7612ae 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3420,9 +3420,14 @@ bond_ethdev_configure(struct rte_eth_dev *dev) "Failed to parse agg selection mode for bonded device %s", name); } - if (internals->mode == BONDING_MODE_8023AD) - rte_eth_bond_8023ad_agg_selection_set(port_id, - agg_mode); + if (internals->mode == BONDING_MODE_8023AD) { + if (rte_eth_bond_8023ad_agg_selection_set(port_id, + agg_mode) < 0) { + RTE_BOND_LOG(ERR, "Invalid args for agg selection" + " set for bonded device %s", name); + return -1; + } + } } /* Parse/add slave ports to bonded device */ -- 2.7.4
On 11/16/2018 2:54 PM, Lee Daly wrote: > This patch checks the return value of function > rte_eth_bond_8023ad_agg_selection_set() in bond_ethdev_configure > for error return value. Thanks Lee, just a few minor syntax comment below. > > Signed-off-by: Lee Daly <lee.daly@intel.com> > --- > drivers/net/bonding/rte_eth_bond_pmd.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c > index 156f31c..a7612ae 100644 > --- a/drivers/net/bonding/rte_eth_bond_pmd.c > +++ b/drivers/net/bonding/rte_eth_bond_pmd.c > @@ -3420,9 +3420,14 @@ bond_ethdev_configure(struct rte_eth_dev *dev) > "Failed to parse agg selection mode for bonded device %s", > name); > } > - if (internals->mode == BONDING_MODE_8023AD) > - rte_eth_bond_8023ad_agg_selection_set(port_id, > - agg_mode); > + if (internals->mode == BONDING_MODE_8023AD) { > + if (rte_eth_bond_8023ad_agg_selection_set(port_id, > + agg_mode) < 0) { It it clear if you extract the function out of if() and check return type in if() > + RTE_BOND_LOG(ERR, "Invalid args for agg selection" > + " set for bonded device %s", name); You can merge the error msg, it is accepted to go beyond 80 chars for msgs. > + return -1; > + } > + } > } > > /* Parse/add slave ports to bonded device */ >
This patch checks the return value of function rte_eth_bond_8023ad_agg_selection_set() in bond_ethdev_configure for error return value. Fixes: 6d72657ce379 ("net/bonding: add other aggregator modes") Cc: stable@dpdk.org V2: syntax changes. commit message update. Signed-off-by: Lee Daly <lee.daly@intel.com> --- drivers/net/bonding/rte_eth_bond_pmd.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 156f31c..953cee5 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3420,9 +3420,16 @@ bond_ethdev_configure(struct rte_eth_dev *dev) "Failed to parse agg selection mode for bonded device %s", name); } - if (internals->mode == BONDING_MODE_8023AD) - rte_eth_bond_8023ad_agg_selection_set(port_id, - agg_mode); + if (internals->mode == BONDING_MODE_8023AD) { + int ret = rte_eth_bond_8023ad_agg_selection_set(port_id, + agg_mode); + if (ret < 0) { + RTE_BOND_LOG(ERR, + "Invalid args for agg selection set for bonded device %s", + name); + return -1; + } + } } /* Parse/add slave ports to bonded device */ -- 2.7.4
On 11/16/2018 4:48 PM, Lee Daly wrote:
> This patch checks the return value of function
> rte_eth_bond_8023ad_agg_selection_set() in bond_ethdev_configure
> for error return value.
>
> Fixes: 6d72657ce379 ("net/bonding: add other aggregator modes")
> Cc: stable@dpdk.org
>
> V2:
> syntax changes.
> commit message update.
>
> Signed-off-by: Lee Daly <lee.daly@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
Applied to dpdk-next-net/master, thanks.