From f74ea27bb5d4e6dd0db39629e4fefd0d1851f8b5 Mon Sep 17 00:00:00 2001 From: Mauricio Vasquez B Date: Wed, 2 Nov 2016 08:46:09 -0500 Subject: [PATCH] net/ring: remove unnecessary NULL check Coverity detected this as an issue because internals->data will never be NULL, then the check is not necessary. Coverity issue: 137873 Fixes: d082c0395bf6 ("ring: fix memory leak when detaching") Signed-off-by: Mauricio Vasquez B Acked-by: Ferruh Yigit --- drivers/net/ring/rte_eth_ring.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index 6d2a8c18f2..c1767c489d 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -599,24 +599,22 @@ rte_pmd_ring_remove(const char *name) eth_dev_stop(eth_dev); - if (eth_dev->data) { - internals = eth_dev->data->dev_private; - if (internals->action == DEV_CREATE) { - /* - * it is only necessary to delete the rings in rx_queues because - * they are the same used in tx_queues - */ - for (i = 0; i < eth_dev->data->nb_rx_queues; i++) { - r = eth_dev->data->rx_queues[i]; - rte_ring_free(r->rng); - } + internals = eth_dev->data->dev_private; + if (internals->action == DEV_CREATE) { + /* + * it is only necessary to delete the rings in rx_queues because + * they are the same used in tx_queues + */ + for (i = 0; i < eth_dev->data->nb_rx_queues; i++) { + r = eth_dev->data->rx_queues[i]; + rte_ring_free(r->rng); } - - rte_free(eth_dev->data->rx_queues); - rte_free(eth_dev->data->tx_queues); - rte_free(eth_dev->data->dev_private); } + rte_free(eth_dev->data->rx_queues); + rte_free(eth_dev->data->tx_queues); + rte_free(eth_dev->data->dev_private); + rte_free(eth_dev->data); rte_eth_dev_release_port(eth_dev); -- 2.20.1