net/mlx5: remove redundant started flag

[dpdk.git] / drivers / net / mlx5 / mlx5_trigger.c

diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 229b05e..212b4df 100644 (file)
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -31,17 +31,10 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* DPDK headers don't like -pedantic. */
-#ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-Wpedantic"
-#endif
 #include <rte_ether.h>
 #include <rte_ethdev.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
-#ifdef PEDANTIC
-#pragma GCC diagnostic error "-Wpedantic"
-#endif
 
 #include "mlx5.h"
 #include "mlx5_rxtx.h"
@@ -68,38 +61,33 @@ mlx5_dev_start(struct rte_eth_dev *dev)
                return -E_RTE_SECONDARY;
 
        priv_lock(priv);
-       if (priv->started) {
-               priv_unlock(priv);
-               return 0;
-       }
+       /* Update Rx/Tx callback. */
+       priv_dev_select_tx_function(priv, dev);
+       priv_dev_select_rx_function(priv, dev);
        DEBUG("%p: allocating and configuring hash RX queues", (void *)dev);
        err = priv_create_hash_rxqs(priv);
        if (!err)
                err = priv_rehash_flows(priv);
-       if (!err)
-               priv->started = 1;
        else {
                ERROR("%p: an error occurred while configuring hash RX queues:"
                      " %s",
                      (void *)priv, strerror(err));
                goto error;
        }
-       if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_NONE)
-               priv_fdir_enable(priv);
        err = priv_flow_start(priv);
        if (err) {
-               priv->started = 0;
                ERROR("%p: an error occurred while configuring flows:"
                      " %s",
                      (void *)priv, strerror(err));
                goto error;
        }
-       priv_dev_interrupt_handler_install(priv, dev);
-       if (dev->data->dev_conf.intr_conf.rxq) {
-               err = priv_intr_efd_enable(priv);
-               if (!err)
-                       err = priv_create_intr_vec(priv);
+       err = priv_rx_intr_vec_enable(priv);
+       if (err) {
+               ERROR("%p: RX interrupt vector creation failed",
+                     (void *)priv);
+               goto error;
        }
+       priv_dev_interrupt_handler_install(priv, dev);
        priv_xstats_init(priv);
        priv_unlock(priv);
        return 0;
@@ -109,6 +97,7 @@ error:
        priv_mac_addrs_disable(priv);
        priv_destroy_hash_rxqs(priv);
        priv_flow_stop(priv);
+       priv_unlock(priv);
        return -err;
 }
 
@@ -129,21 +118,12 @@ mlx5_dev_stop(struct rte_eth_dev *dev)
                return;
 
        priv_lock(priv);
-       if (!priv->started) {
-               priv_unlock(priv);
-               return;
-       }
        DEBUG("%p: cleaning up and destroying hash RX queues", (void *)dev);
        priv_special_flow_disable_all(priv);
        priv_mac_addrs_disable(priv);
        priv_destroy_hash_rxqs(priv);
-       priv_fdir_disable(priv);
        priv_flow_stop(priv);
+       priv_rx_intr_vec_disable(priv);
        priv_dev_interrupt_handler_uninstall(priv, dev);
-       if (priv->dev->data->dev_conf.intr_conf.rxq) {
-               priv_destroy_intr_vec(priv);
-               priv_intr_efd_disable(priv);
-       }
-       priv->started = 0;
        priv_unlock(priv);
 }