net/mlx5: report error on indirect CT action destroy

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

diff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c
index 80b1256..7f19b23 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxmode.c
+++ b/drivers/net/mlx5/mlx5_rxmode.c
@@ -7,20 +7,10 @@
 #include <errno.h>
 #include <string.h>
 
-/* Verbs header. */
-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */
-#ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-Wpedantic"
-#endif
-#include <infiniband/verbs.h>
-#ifdef PEDANTIC
-#pragma GCC diagnostic error "-Wpedantic"
-#endif
-
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
+#include <mlx5_glue.h>
 #include "mlx5.h"
-#include "mlx5_rxtx.h"
 #include "mlx5_utils.h"
 
 /**
@@ -46,7 +36,7 @@ mlx5_promiscuous_enable(struct rte_eth_dev *dev)
                        dev->data->port_id);
                return 0;
        }
-       if (priv->config.vf) {
+       if (priv->config.vf || priv->config.sf) {
                ret = mlx5_os_set_promisc(dev, 1);
                if (ret)
                        return ret;
@@ -79,7 +69,7 @@ mlx5_promiscuous_disable(struct rte_eth_dev *dev)
        int ret;
 
        dev->data->promiscuous = 0;
-       if (priv->config.vf) {
+       if (priv->config.vf || priv->config.sf) {
                ret = mlx5_os_set_promisc(dev, 0);
                if (ret)
                        return ret;
@@ -119,7 +109,7 @@ mlx5_allmulticast_enable(struct rte_eth_dev *dev)
                        dev->data->port_id);
                return 0;
        }
-       if (priv->config.vf) {
+       if (priv->config.vf || priv->config.sf) {
                ret = mlx5_os_set_allmulti(dev, 1);
                if (ret)
                        goto error;
@@ -152,7 +142,7 @@ mlx5_allmulticast_disable(struct rte_eth_dev *dev)
        int ret;
 
        dev->data->all_multicast = 0;
-       if (priv->config.vf) {
+       if (priv->config.vf || priv->config.sf) {
                ret = mlx5_os_set_allmulti(dev, 0);
                if (ret)
                        goto error;