X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fkni%2Frte_eth_kni.c;h=72a2733ba59c52b4fc9f522871987d5b05790f0d;hb=1d5d4ab903f8c20c3eb42c8f37660b8b6884125a;hp=8f900342cf237211377e12b8fa8d4083239b3c2c;hpb=050fe6e9ff970ff92d842912136be8f9f52e171f;p=dpdk.git

diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index 8f900342cf..72a2733ba5 100644
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -145,7 +145,7 @@ eth_kni_start(struct rte_eth_dev *dev)
 	uint16_t port_id = dev->data->port_id;
 	struct rte_mempool *mb_pool;
 	struct rte_kni_conf conf;
-	const char *name = dev->data->name + 4; /* remove net_ */
+	const char *name = dev->device->name + 4; /* remove net_ */
 
 	snprintf(conf.name, RTE_KNI_NAMESIZE, "%s", name);
 	conf.force_bind = 0;
@@ -486,12 +486,10 @@ eth_kni_remove(struct rte_vdev_device *vdev)
 
 	eth_kni_dev_stop(eth_dev);
 
-	if (eth_dev->data) {
-		internals = eth_dev->data->dev_private;
-		rte_kni_release(internals->kni);
+	internals = eth_dev->data->dev_private;
+	rte_kni_release(internals->kni);
 
-		rte_free(internals);
-	}
+	rte_free(internals);
 	rte_free(eth_dev->data);
 
 	rte_eth_dev_release_port(eth_dev);