From 61207d014fc906302a184ae2f779b54ccfd0cd4c Mon Sep 17 00:00:00 2001 From: Yuanhan Liu Date: Fri, 20 Jan 2017 16:04:53 +0800 Subject: [PATCH] ethdev: fix data reset when allocating port Fix an silly error by auto-complete while managing the merge conflicts. It's the eth_dev_data (but not eth_dev) entry should be memset. Fixes: d948f596fee2 ("ethdev: fix port data mismatched in multiple process model") Reported-by: Ferruh Yigit Signed-off-by: Yuanhan Liu --- lib/librte_ether/rte_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 4790fafa4f..61f44e218a 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -225,7 +225,7 @@ rte_eth_dev_allocate(const char *name) return NULL; } - memset(&rte_eth_devices[port_id], 0, sizeof(*eth_dev->data)); + memset(&rte_eth_dev_data[port_id], 0, sizeof(struct rte_eth_dev_data)); eth_dev = eth_dev_get(port_id); snprintf(eth_dev->data->name, sizeof(eth_dev->data->name), "%s", name); eth_dev->data->port_id = port_id; -- 2.20.1