net/mlx5e: Do early return when setup vports dests for slow path flow

Adding flow flag cases in setup vport dests before the slow path
case is incorrect as the slow path should take precedence.
Current code doesn't show this importance so make the slow path
case return early and separate from the other cases and remove
the redundant comparison of it in the sample case.

Signed-off-by: Roi Dayan <roid@nvidia.com>
Reviewed-by: Chris Mi <cmi@nvidia.com>
Reviewed-by: Oz Shlomo <ozsh@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 8c6c9bcb3dc3ff61befdb12d2007055e34a5115c..4b358b87fead652489c9043a2d23b6fc3530a604 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -479,13 +479,15 @@ esw_setup_dests(struct mlx5_flow_destination *dest,
            esw_src_port_rewrite_supported(esw))
                attr->flags |= MLX5_ATTR_FLAG_SRC_REWRITE;
 
-       if (attr->flags & MLX5_ATTR_FLAG_SAMPLE &&
-           !(attr->flags & MLX5_ATTR_FLAG_SLOW_PATH)) {
-               esw_setup_sampler_dest(dest, flow_act, attr->sample_attr.sampler_id, *i);
-               (*i)++;
-       } else if (attr->flags & MLX5_ATTR_FLAG_SLOW_PATH) {
+       if (attr->flags & MLX5_ATTR_FLAG_SLOW_PATH) {
                esw_setup_slow_path_dest(dest, flow_act, esw, *i);
                (*i)++;
+               goto out;
+       }
+
+       if (attr->flags & MLX5_ATTR_FLAG_SAMPLE) {
+               esw_setup_sampler_dest(dest, flow_act, attr->sample_attr.sampler_id, *i);
+               (*i)++;
        } else if (attr->flags & MLX5_ATTR_FLAG_ACCEPT) {
                esw_setup_accept_dest(dest, flow_act, chains, *i);
                (*i)++;
@@ -506,6 +508,7 @@ esw_setup_dests(struct mlx5_flow_destination *dest,
                }
        }
 
+out:
        return err;
 }