From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id A7BA4354D for ; Thu, 11 Jan 2018 10:26:05 +0100 (CET) Received: by mail-wm0-f65.google.com with SMTP id 81so5474275wmb.1 for ; Thu, 11 Jan 2018 01:26:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=uPgcYA38F0T/o8drenMgpIMmwBag/atT/tFqFsXg1qg=; b=t1XoFyUBA9R/P7rPAzhp4YqA4+Q+V03V8AinI86ph1y3sxTtYv8+yl2L2uN+zmaz2y Peb74noVxmHYGr5XxbzbZ0DT7ArJq3leBMgiBmS8Kya6Y11hOzu7oOUV0EwH/aa0Wyb6 6TjQpp6TJZtCrTveP4aB47IzTdC2sfCdhRcAfz9HK5ULLWouo3tbjfYaySRYl/Sqywmu Maw1oLFy0BkTJwO3fnD4Av2KsmNwCjOvG/bjOQxM5ZUuOEQWsJ3sFkxVUsMI17Pr7jYq Lk0cAWYLYIB5iDhvy2KkePifAN7xajI0jkT/3GWOR4zaJPeIKL42h//D/G25XYHap8m3 /f3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uPgcYA38F0T/o8drenMgpIMmwBag/atT/tFqFsXg1qg=; b=PsLeD74yTs905Pr2z6rzRgM7YKQ+FPpevc3KMumiSOvH8+JkeM8wrLqx49kpYXD6+B 85NAJ/TTrxi4+lBbM9ILrTLuz/HNTjACdc8hWMiEz7LxpNcMRzNYD6xbNHCOufF9cScc 6OdVE7MOtRcJshspxyV7mIw3SSfx+jsWSm0RnLR7VHsS8vM6oqDzBrBJJCQ3GyIhpZ5A 8WNeJ2eTi4u5Mwc5FupXv/QztxltM8LVuN2SF0/sYZJdbjUq02WXUaK5B+KxOdlrftyY 63G9pGHppYyAKfZlWfDpm1LWpR2wzGieN6j036Nu6ZAhvcaFkSsqxUzm1vw4Nwk+oc9z 6ruA== X-Gm-Message-State: AKGB3mLtaqrJ9ztl2BeSrB2BDJf8h9d+fJvvhbTbp7DZuHrR4UePBgTa oJnJsm8hVw3S0z41BIJrFDaZPbK7Qg== X-Google-Smtp-Source: ACJfBouRs+HjbfArdjqP8LmGgDc+6+hb0eOo57NIAw5zfrJvHJrq+0pI12LEE7hnJi4OrXXZlaEZdw== X-Received: by 10.80.147.6 with SMTP id m6mr30639164eda.113.1515662765111; Thu, 11 Jan 2018 01:26:05 -0800 (PST) Received: from laranjeiro-vm.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id m1sm10394103ede.74.2018.01.11.01.26.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 01:26:04 -0800 (PST) From: Nelio Laranjeiro To: dev@dpdk.org, Yongseok Koh , Adrien Mazarguil Cc: rasland@mellanox.com Date: Thu, 11 Jan 2018 10:25:22 +0100 Message-Id: X-Mailer: git-send-email 2.11.0 Subject: [dpdk-dev] [PATCH] net/mlx5: fix all multi verification code position X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jan 2018 09:26:05 -0000 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: rasland@mellanox.com Signed-off-by: Nelio Laranjeiro --- 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