ethdev: fix device state on detach

[dpdk.git] / lib / librte_ether / rte_ethdev.c

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 76179fd..8c365ed 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -72,7 +72,6 @@ static const char *MZ_RTE_ETH_DEV_DATA = "rte_eth_dev_data";
 struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
 static struct rte_eth_dev_data *rte_eth_dev_data;
 static uint8_t eth_dev_last_created_port;
-static uint8_t nb_ports;
 
 /* spinlock for eth device callbacks */
 static rte_spinlock_t rte_eth_dev_cb_lock = RTE_SPINLOCK_INITIALIZER;
@@ -210,7 +209,6 @@ eth_dev_get(uint8_t port_id)
        TAILQ_INIT(&(eth_dev->link_intr_cbs));
 
        eth_dev_last_created_port = port_id;
-       nb_ports++;
 
        return eth_dev;
 }
@@ -283,7 +281,6 @@ rte_eth_dev_release_port(struct rte_eth_dev *eth_dev)
                return -EINVAL;
 
        eth_dev->state = RTE_ETH_DEV_UNUSED;
-       nb_ports--;
        return 0;
 }
 
@@ -291,7 +288,8 @@ int
 rte_eth_dev_is_valid_port(uint8_t port_id)
 {
        if (port_id >= RTE_MAX_ETHPORTS ||
-           rte_eth_devices[port_id].state != RTE_ETH_DEV_ATTACHED)
+           (rte_eth_devices[port_id].state != RTE_ETH_DEV_ATTACHED &&
+            rte_eth_devices[port_id].state != RTE_ETH_DEV_DEFERRED))
                return 0;
        else
                return 1;
@@ -307,7 +305,15 @@ rte_eth_dev_socket_id(uint8_t port_id)
 uint8_t
 rte_eth_dev_count(void)
 {
-       return nb_ports;
+       uint8_t p;
+       uint8_t count;
+
+       count = 0;
+
+       RTE_ETH_FOREACH_DEV(p)
+               count++;
+
+       return count;
 }
 
 int
@@ -340,9 +346,6 @@ rte_eth_dev_get_port_by_name(const char *name, uint8_t *port_id)
                return -EINVAL;
        }
 
-       if (!nb_ports)
-               return -ENODEV;
-
        RTE_ETH_FOREACH_DEV(i) {
                if (!rte_eth_devices[i].device)
                        continue;
@@ -450,6 +453,7 @@ rte_eth_dev_detach(uint8_t port_id, char *name)
        if (ret < 0)
                goto err;
 
+       rte_eth_devices[port_id].state = RTE_ETH_DEV_UNUSED;
        return 0;
 
 err:
@@ -2374,6 +2378,7 @@ get_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
        unsigned i;
 
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        rte_eth_dev_info_get(port_id, &dev_info);
 
        for (i = 0; i < dev_info.max_mac_addrs; i++)