[dpdk-stable] patch 'net/null: remove redundant check' has been queued to LTS release 18.11.9

Kevin Traynor ktraynor at redhat.com
Thu May 28 18:22:58 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/03/20. 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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4fcd7720f7e126eb36ee1367956e184f5f44cac2

Thanks.

Kevin.

---
>From 4fcd7720f7e126eb36ee1367956e184f5f44cac2 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Mon, 2 Mar 2020 17:36:42 +0000
Subject: [PATCH] net/null: remove redundant check

[ upstream commit c21a276bd8f3d4c5210ccd2074f7a87a7d00b3e4 ]

There is no need to check if the argument exist or not,
`rte_kvargs_process` returns success if the argument is not provided at
all.

Fixes: c743e50c475f ("null: new poll mode driver")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/null/rte_eth_null.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 95314982c3..1de26b0f69 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -640,21 +640,16 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
 			return -1;
 
-		if (rte_kvargs_count(kvlist, ETH_NULL_PACKET_SIZE_ARG) == 1) {
+		ret = rte_kvargs_process(kvlist,
+				ETH_NULL_PACKET_SIZE_ARG,
+				&get_packet_size_arg, &packet_size);
+		if (ret < 0)
+			goto free_kvlist;
 
-			ret = rte_kvargs_process(kvlist,
-					ETH_NULL_PACKET_SIZE_ARG,
-					&get_packet_size_arg, &packet_size);
-			if (ret < 0)
-				goto free_kvlist;
-		}
 
-		if (rte_kvargs_count(kvlist, ETH_NULL_PACKET_COPY_ARG) == 1) {
-
-			ret = rte_kvargs_process(kvlist,
-					ETH_NULL_PACKET_COPY_ARG,
-					&get_packet_copy_arg, &packet_copy);
-			if (ret < 0)
-				goto free_kvlist;
-		}
+		ret = rte_kvargs_process(kvlist,
+				ETH_NULL_PACKET_COPY_ARG,
+				&get_packet_copy_arg, &packet_copy);
+		if (ret < 0)
+			goto free_kvlist;
 	}
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:02.768601162 +0100
+++ 0071-net-null-remove-redundant-check.patch	2020-05-28 17:12:59.152555246 +0100
@@ -1 +1 @@
-From c21a276bd8f3d4c5210ccd2074f7a87a7d00b3e4 Mon Sep 17 00:00:00 2001
+From 4fcd7720f7e126eb36ee1367956e184f5f44cac2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c21a276bd8f3d4c5210ccd2074f7a87a7d00b3e4 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 87a29b8535..beedd5f4b2 100644
+index 95314982c3..1de26b0f69 100644
@@ -22 +23 @@
-@@ -611,21 +611,16 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
+@@ -640,21 +640,16 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)



More information about the stable mailing list