net/enic: fix freeing memory for descriptor ring

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

diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c
index 7eb688a..0bed74e 100644 (file)
--- a/drivers/net/mlx5/mlx5_rss.c
+++ b/drivers/net/mlx5/mlx5_rss.c
@@ -40,21 +40,21 @@
 /* Verbs header. */
 /* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */
 #ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-pedantic"
+#pragma GCC diagnostic ignored "-Wpedantic"
 #endif
 #include <infiniband/verbs.h>
 #ifdef PEDANTIC
-#pragma GCC diagnostic error "-pedantic"
+#pragma GCC diagnostic error "-Wpedantic"
 #endif
 
 /* DPDK headers don't like -pedantic. */
 #ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-pedantic"
+#pragma GCC diagnostic ignored "-Wpedantic"
 #endif
 #include <rte_malloc.h>
 #include <rte_ethdev.h>
 #ifdef PEDANTIC
-#pragma GCC diagnostic error "-pedantic"
+#pragma GCC diagnostic error "-Wpedantic"
 #endif
 
 #include "mlx5.h"
@@ -156,17 +156,8 @@ mlx5_rss_hash_update(struct rte_eth_dev *dev,
                                                rss_conf->rss_key,
                                                rss_conf->rss_key_len,
                                                rss_conf->rss_hf);
-       else
-               err = rss_hash_rss_conf_new_key(priv,
-                                               rss_hash_default_key,
-                                               rss_hash_default_key_len,
-                                               ETH_RSS_PROTO_MASK);
-
-       /* Store the configuration set into port configure.
-        * This will enable/disable hash RX queues associated to the protocols
-        * enabled/disabled by this update. */
-       priv->dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf =
-               rss_conf->rss_hf;
+       /* Store protocols for which RSS is enabled. */
+       priv->rss_hf = rss_conf->rss_hf;
        priv_unlock(priv);
        assert(err >= 0);
        return -err;