[dpdk-stable] patch 'net/mlx5: fix errno values for flow engine' has been queued to stable release 18.08.1

Kevin Traynor ktraynor at redhat.com
Wed Nov 21 17:48:09 CET 2018


Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/27/18. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 1d79caa2d1fc150f4edb5f8e128b6de50416d815 Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh at mellanox.com>
Date: Mon, 8 Oct 2018 18:02:19 +0000
Subject: [PATCH] net/mlx5: fix errno values for flow engine

[ upstream commit c10f5d643b28a3bff1156ae54d5ebcfda15f34d9 ]

Fixes: af689f1f04c2 ("net/mlx5: support flow Ethernet item along with drop action")
Fixes: 919d53ad78d2 ("net/mlx5: fix count query when flow has not counter")

Signed-off-by: Yongseok Koh <yskoh at mellanox.com>
Acked-by: Ori Kam <orika at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 3f548a9a4..4f21215df 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -688,8 +688,8 @@ mlx5_flow_item_acceptable(const struct rte_flow_item *item,
 		ret = memcmp(spec, last, size);
 		if (ret != 0)
-			return rte_flow_error_set(error, ENOTSUP,
+			return rte_flow_error_set(error, EINVAL,
 						  RTE_FLOW_ERROR_TYPE_ITEM,
 						  item,
-						  "range is not supported");
+						  "range is not valid");
 	}
 	return 0;
@@ -3406,5 +3406,5 @@ mlx5_flow_query_count(struct rte_flow *flow __rte_unused,
 		return 0;
 	}
-	return rte_flow_error_set(error, ENOTSUP,
+	return rte_flow_error_set(error, EINVAL,
 				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
 				  NULL,
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 16:44:32.447706520 +0000
+++ 0055-net-mlx5-fix-errno-values-for-flow-engine.patch	2018-11-21 16:44:30.000000000 +0000
@@ -1,11 +1,12 @@
-From c10f5d643b28a3bff1156ae54d5ebcfda15f34d9 Mon Sep 17 00:00:00 2001
+From 1d79caa2d1fc150f4edb5f8e128b6de50416d815 Mon Sep 17 00:00:00 2001
 From: Yongseok Koh <yskoh at mellanox.com>
 Date: Mon, 8 Oct 2018 18:02:19 +0000
 Subject: [PATCH] net/mlx5: fix errno values for flow engine
 
+[ upstream commit c10f5d643b28a3bff1156ae54d5ebcfda15f34d9 ]
+
 Fixes: af689f1f04c2 ("net/mlx5: support flow Ethernet item along with drop action")
 Fixes: 919d53ad78d2 ("net/mlx5: fix count query when flow has not counter")
-Cc: stable at dpdk.org
 
 Signed-off-by: Yongseok Koh <yskoh at mellanox.com>
 Acked-by: Ori Kam <orika at mellanox.com>
@@ -14,10 +15,10 @@
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
-index 078b07619..ed60c40f9 100644
+index 3f548a9a4..4f21215df 100644
 --- a/drivers/net/mlx5/mlx5_flow.c
 +++ b/drivers/net/mlx5/mlx5_flow.c
-@@ -453,8 +453,8 @@ mlx5_flow_item_acceptable(const struct rte_flow_item *item,
+@@ -688,8 +688,8 @@ mlx5_flow_item_acceptable(const struct rte_flow_item *item,
  		ret = memcmp(spec, last, size);
  		if (ret != 0)
 -			return rte_flow_error_set(error, ENOTSUP,
@@ -28,7 +29,7 @@
 +						  "range is not valid");
  	}
  	return 0;
-@@ -2337,5 +2337,5 @@ mlx5_flow_query_count(struct rte_flow *flow __rte_unused,
+@@ -3406,5 +3406,5 @@ mlx5_flow_query_count(struct rte_flow *flow __rte_unused,
  		return 0;
  	}
 -	return rte_flow_error_set(error, ENOTSUP,


More information about the stable mailing list