From 4fcd7720f7e126eb36ee1367956e184f5f44cac2 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit 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 --- drivers/net/null/rte_eth_null.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 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 @@ -639,23 +639,18 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) if (kvlist == NULL) 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; - } - - 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_SIZE_ARG, + &get_packet_size_arg, &packet_size); + 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; } PMD_LOG(INFO, "Configure pmd_null: packet size is %d, "