net/sfc: fix RSS hash offload if queue action is used

[dpdk.git] / drivers / net / ring / rte_eth_ring.c

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index f0fafa0..12046f5 100644 (file)
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -61,7 +61,7 @@ static struct rte_eth_link pmd_link = {
        .link_autoneg = ETH_LINK_FIXED,
 };
 
-static int eth_ring_logtype;
+RTE_LOG_REGISTER(eth_ring_logtype, pmd.net.ring, NOTICE);
 
 #define PMD_LOG(level, fmt, args...) \
        rte_log(RTE_LOG_ ## level, eth_ring_logtype, \
@@ -226,7 +226,38 @@ static int
 eth_link_update(struct rte_eth_dev *dev __rte_unused,
                int wait_to_complete __rte_unused) { return 0; }
 
+static int
+eth_dev_close(struct rte_eth_dev *dev)
+{
+       struct pmd_internals *internals = NULL;
+       struct ring_queue *r = NULL;
+       uint16_t i;
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       eth_dev_stop(dev);
+
+       internals = 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 < dev->data->nb_rx_queues; i++) {
+                       r = dev->data->rx_queues[i];
+                       rte_ring_free(r->rng);
+               }
+       }
+
+       /* mac_addrs must not be freed alone because part of dev_private */
+       dev->data->mac_addrs = NULL;
+
+       return 0;
+}
+
 static const struct eth_dev_ops ops = {
+       .dev_close = eth_dev_close,
        .dev_start = eth_dev_start,
        .dev_stop = eth_dev_stop,
        .dev_set_link_up = eth_dev_set_link_up,
@@ -326,7 +357,6 @@ do_eth_dev_ring_create(const char *name,
        data->all_multicast = 1;
 
        eth_dev->dev_ops = &ops;
-       data->kdrv = RTE_KDRV_NONE;
        data->numa_node = numa_node;
 
        /* finally assign rx and tx ops */
@@ -659,9 +689,6 @@ rte_pmd_ring_remove(struct rte_vdev_device *dev)
 {
        const char *name = rte_vdev_device_name(dev);
        struct rte_eth_dev *eth_dev = NULL;
-       struct pmd_internals *internals = NULL;
-       struct ring_queue *r = NULL;
-       uint16_t i;
 
        PMD_LOG(INFO, "Un-Initializing pmd_ring for %s", name);
 
@@ -671,24 +698,9 @@ rte_pmd_ring_remove(struct rte_vdev_device *dev)
        /* find an ethdev entry */
        eth_dev = rte_eth_dev_allocated(name);
        if (eth_dev == NULL)
-               return -ENODEV;
+               return 0; /* port already released */
 
-       eth_dev_stop(eth_dev);
-
-       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);
-               }
-       }
-
-       /* mac_addrs must not be freed alone because part of dev_private */
-       eth_dev->data->mac_addrs = NULL;
+       eth_dev_close(eth_dev);
        rte_eth_dev_release_port(eth_dev);
        return 0;
 }
@@ -702,10 +714,3 @@ RTE_PMD_REGISTER_VDEV(net_ring, pmd_ring_drv);
 RTE_PMD_REGISTER_ALIAS(net_ring, eth_ring);
 RTE_PMD_REGISTER_PARAM_STRING(net_ring,
        ETH_RING_NUMA_NODE_ACTION_ARG "=name:node:action(ATTACH|CREATE)");
-
-RTE_INIT(eth_ring_init_log)
-{
-       eth_ring_logtype = rte_log_register("pmd.net.ring");
-       if (eth_ring_logtype >= 0)
-               rte_log_set_level(eth_ring_logtype, RTE_LOG_NOTICE);
-}