app/eventdev: add ethernet device setup helpers

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

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 6605cfd..ff9fd78 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -50,6 +50,7 @@
 #include <rte_malloc.h>
 
 #include "mlx5.h"
+#include "mlx5_defs.h"
 #include "mlx5_prm.h"
 
 /* Define minimal priority for control plane flows. */
@@ -568,9 +569,15 @@ priv_flow_convert_rss_conf(struct priv *priv,
                           struct mlx5_flow_parse *parser,
                           const struct rte_eth_rss_conf *rss_conf)
 {
-       const struct rte_eth_rss_conf *rss =
-               rss_conf ? rss_conf : &priv->rss_conf;
+       const struct rte_eth_rss_conf *rss;
 
+       if (rss_conf) {
+               if (rss_conf->rss_hf & MLX5_RSS_HF_MASK)
+                       return EINVAL;
+               rss = rss_conf;
+       } else {
+               rss = &priv->rss_conf;
+       }
        if (rss->rss_key_len > 40)
                return EINVAL;
        parser->rss_conf.rss_key_len = rss->rss_key_len;
@@ -771,7 +778,7 @@ priv_flow_convert_actions(struct priv *priv,
                } else if (actions->type == RTE_FLOW_ACTION_TYPE_FLAG) {
                        parser->mark = 1;
                } else if (actions->type == RTE_FLOW_ACTION_TYPE_COUNT &&
-                          priv->counter_set_supported) {
+                          priv->config.flow_counter_en) {
                        parser->count = 1;
                } else {
                        goto exit_action_not_supported;
@@ -861,6 +868,10 @@ priv_flow_convert_items_validate(struct priv *priv,
                                parser->queue[n].offset += cur_item->dst_sz;
                }
        }
+       if (parser->drop) {
+               parser->queue[HASH_RXQ_ETH].offset +=
+                       sizeof(struct ibv_flow_spec_action_drop);
+       }
        if (parser->mark) {
                for (i = 0; i != hash_rxq_init_n; ++i)
                        parser->queue[i].offset +=