net/ngbe: support MAC filters

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

diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c
index 60029f7..0a89a13 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -83,6 +83,11 @@ mlx5_flow_discover_priorities(struct rte_eth_dev *dev)
        int i;
        int priority = 0;
 
+#if defined(HAVE_MLX5DV_DR_DEVX_PORT) || defined(HAVE_MLX5DV_DR_DEVX_PORT_V35)
+       /* If DevX supported, driver must support 16 verbs flow priorities. */
+       priority = RTE_DIM(priority_map_5);
+       goto out;
+#endif
        if (!drop->qp) {
                rte_errno = ENOTSUP;
                return -rte_errno;
@@ -109,6 +114,9 @@ mlx5_flow_discover_priorities(struct rte_eth_dev *dev)
                        dev->data->port_id, priority);
                return -rte_errno;
        }
+#if defined(HAVE_MLX5DV_DR_DEVX_PORT) || defined(HAVE_MLX5DV_DR_DEVX_PORT_V35)
+out:
+#endif
        DRV_LOG(INFO, "port %u supported flow priorities:"
                " 0-%d for ingress or egress root table,"
                " 0-%d for non-root table or transfer root table.",
@@ -137,7 +145,7 @@ mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,
        uint32_t res = 0;
        struct mlx5_priv *priv = dev->data->dev_private;
 
-       switch (priv->config.flow_prio) {
+       switch (priv->sh->flow_max_priority) {
        case RTE_DIM(priority_map_3):
                res = priority_map_3[priority][subpriority];
                break;
@@ -1715,7 +1723,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
        MLX5_ASSERT(wks);
        rss_desc = &wks->rss_desc;
        if (priority == MLX5_FLOW_LOWEST_PRIO_INDICATOR)
-               priority = priv->config.flow_prio - 1;
+               priority = priv->sh->flow_max_priority - 1;
        for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
                int ret;
 
@@ -1816,7 +1824,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
                        if (dev_flow->hash_fields != 0)
                                dev_flow->hash_fields |=
                                        mlx5_flow_hashfields_adjust
-                                       (rss_desc, tunnel, ETH_RSS_TCP,
+                                       (rss_desc, tunnel, RTE_ETH_RSS_TCP,
                                         (IBV_RX_HASH_SRC_PORT_TCP |
                                          IBV_RX_HASH_DST_PORT_TCP));
                        item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L4_TCP :
@@ -1829,7 +1837,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
                        if (dev_flow->hash_fields != 0)
                                dev_flow->hash_fields |=
                                        mlx5_flow_hashfields_adjust
-                                       (rss_desc, tunnel, ETH_RSS_UDP,
+                                       (rss_desc, tunnel, RTE_ETH_RSS_UDP,
                                         (IBV_RX_HASH_SRC_PORT_UDP |
                                          IBV_RX_HASH_DST_PORT_UDP));
                        item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L4_UDP :