All multi code should not be handled in exit part of the code but in the
mainline of the function.

Fixes: 4241d84c0a32 ("net/mlx5: fix flow type for allmulti rules")
Cc: rasl...@mellanox.com

Signed-off-by: Nelio Laranjeiro <nelio.laranje...@6wind.com>
---
 drivers/net/mlx5/mlx5_flow.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 334a4f4ba..f050ea713 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1156,16 +1156,6 @@ priv_flow_convert(struct priv *priv,
                        attr->priority +
                        hash_rxq_init[parser->layer].flow_priority;
        }
-exit_free:
-       /* Only verification is expected, all resources should be released. */
-       if (!parser->create) {
-               for (i = 0; i != hash_rxq_init_n; ++i) {
-                       if (parser->queue[i].ibv_attr) {
-                               rte_free(parser->queue[i].ibv_attr);
-                               parser->queue[i].ibv_attr = NULL;
-                       }
-               }
-       }
        if (parser->allmulti &&
            parser->layer == HASH_RXQ_ETH) {
                for (i = 0; i != hash_rxq_init_n; ++i) {
@@ -1177,6 +1167,16 @@ priv_flow_convert(struct priv *priv,
                                                IBV_FLOW_ATTR_MC_DEFAULT;
                }
        }
+exit_free:
+       /* Only verification is expected, all resources should be released. */
+       if (!parser->create) {
+               for (i = 0; i != hash_rxq_init_n; ++i) {
+                       if (parser->queue[i].ibv_attr) {
+                               rte_free(parser->queue[i].ibv_attr);
+                               parser->queue[i].ibv_attr = NULL;
+                       }
+               }
+       }
        return ret;
 exit_enomem:
        for (i = 0; i != hash_rxq_init_n; ++i) {
-- 
2.11.0

Reply via email to