net/ixgbe: remove dependence on Tx queue flags

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

diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
index 643f3d6..b414a78 100644 (file)
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -1,34 +1,6 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright 2017 6WIND S.A.
- *   Copyright 2017 Mellanox.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of 6WIND S.A. nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2017 6WIND S.A.
+ * Copyright 2017 Mellanox Technologies, Ltd
  */
 
 #include <unistd.h>
@@ -308,6 +280,7 @@ fs_dev_remove(struct sub_device *sdev)
                /* the end */
                break;
        }
+       sdev->remove = 0;
        failsafe_hotplug_alarm_install(sdev->fs_dev);
 }
 
@@ -355,8 +328,11 @@ failsafe_dev_remove(struct rte_eth_dev *dev)
 
        FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
                if (sdev->remove && fs_rxtx_clean(sdev)) {
+                       if (fs_lock(dev, 1) != 0)
+                               return;
                        fs_dev_stats_save(sdev);
                        fs_dev_remove(sdev);
+                       fs_unlock(dev, 1);
                }
 }
 
@@ -456,6 +432,7 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused,
 {
        struct sub_device *sdev = cb_arg;
 
+       fs_lock(sdev->fs_dev, 0);
        /* Switch as soon as possible tx_dev. */
        fs_switch_dev(sdev->fs_dev, sdev);
        /* Use safe bursts in any case. */
@@ -465,6 +442,7 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused,
         * the callback at the source of the current thread context.
         */
        sdev->remove = 1;
+       fs_unlock(sdev->fs_dev, 0);
        return 0;
 }