net/hns3: fix queue state when concurrent with reset

[dpdk.git] / drivers / net / failsafe / failsafe.c

diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 44d47e8..e3bda0d 100644 (file)
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -7,8 +7,8 @@
 
 #include <rte_alarm.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_devargs.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
@@ -180,7 +180,6 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
                ERROR("Unable to allocate rte_eth_dev");
                return -1;
        }
-       dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
        priv = PRIV(dev);
        priv->data = dev->data;
        priv->rxp = FS_RX_PROXY_INIT;
@@ -230,7 +229,7 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
        if (failsafe_mac_from_arg) {
                /*
                 * If MAC address was provided as a parameter,
-                * apply to all probed slaves.
+                * apply to all probed subdevices.
                 */
                FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
                        ret = rte_eth_dev_default_mac_addr_set(PORT_ID(sdev),
@@ -255,8 +254,8 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
                 * If no device has been probed and no ether_addr
                 * has been provided on the command line, use a random
                 * valid one.
-                * It will be applied during future slave state syncs to
-                * probed slaves.
+                * It will be applied during future state syncs to
+                * probed subdevices.
                 */
                if (i == priv->subs_tail)
                        rte_eth_random_addr(&mac->addr_bytes[0]);
@@ -265,7 +264,8 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
                mac->addr_bytes[0], mac->addr_bytes[1],
                mac->addr_bytes[2], mac->addr_bytes[3],
                mac->addr_bytes[4], mac->addr_bytes[5]);
-       dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC;
+       dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC |
+                               RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
        PRIV(dev)->intr_handle = (struct rte_intr_handle){
                .fd = -1,
                .type = RTE_INTR_HANDLE_EXT,