summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRadu Nicolau <radu.nicolau@intel.com>2018-10-31 15:50:08 +0000
committerFerruh Yigit <ferruh.yigit@intel.com>2018-11-05 15:01:25 +0100
commit7dc58bc7611a8ae899f654207aa6ddf4063a52d8 (patch)
tree7e3fc8c747bbd3c989a4284d1dc2bdd178f4efc9 /drivers
parent4d7877fde2ef78639aa21273d585201884045abd (diff)
downloaddpdk-7dc58bc7611a8ae899f654207aa6ddf4063a52d8.zip
dpdk-7dc58bc7611a8ae899f654207aa6ddf4063a52d8.tar.gz
dpdk-7dc58bc7611a8ae899f654207aa6ddf4063a52d8.tar.xz
net/bonding: fix crash on probe
After the patch below the call to rte_eth_bond_8023ad_agg_selection_set from probe() segfaults; there is no need to call the function, just set the mode directly. Also, reverted 1620175b400e. Fixes: 391797f04208 ("drivers/bus: move driver assignment to end of probing") Fixes: 1620175b400e ("net/bonding: fix invalid port id") Cc: stable@dpdk.org Signed-off-by: Radu Nicolau <radu.nicolau@intel.com> Acked-by: Chas Williams <chas3@att.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/bonding/rte_eth_bond_pmd.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 156f31c..1a6d8e4 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -3216,8 +3216,6 @@ bond_probe(struct rte_vdev_device *dev)
internals = rte_eth_devices[port_id].data->dev_private;
internals->kvlist = kvlist;
- rte_eth_dev_probing_finish(&rte_eth_devices[port_id]);
-
if (rte_kvargs_count(kvlist, PMD_BOND_AGG_MODE_KVARG) == 1) {
if (rte_kvargs_process(kvlist,
PMD_BOND_AGG_MODE_KVARG,
@@ -3230,12 +3228,12 @@ bond_probe(struct rte_vdev_device *dev)
}
if (internals->mode == BONDING_MODE_8023AD)
- rte_eth_bond_8023ad_agg_selection_set(port_id,
- agg_mode);
+ internals->mode4.agg_selection = agg_mode;
} else {
- rte_eth_bond_8023ad_agg_selection_set(port_id, AGG_STABLE);
+ internals->mode4.agg_selection = AGG_STABLE;
}
+ rte_eth_dev_probing_finish(&rte_eth_devices[port_id]);
RTE_BOND_LOG(INFO, "Create bonded device %s on port %d in mode %u on "
"socket %u.", name, port_id, bonding_mode, socket_id);
return 0;