From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DBBE0A0093 for ; Tue, 19 May 2020 15:09:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D3E181D174; Tue, 19 May 2020 15:09:23 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 8F44B1D174 for ; Tue, 19 May 2020 15:09:22 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id n18so3481863wmj.5 for ; Tue, 19 May 2020 06:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R70Ab/g7T2P6LaYaqQLBDrqh5nMr9JqDorsDVbZmxl8=; b=Neg46eRVBwq5tZ5GUD/YzyH45oZn+ytIEQV6Kgp0S9AcVpYJhj2lKR9Zq3bttEhVmY PAKyv0GcoeMBdszcXhOgipAW7A0gb6Q78FKxekcQ/LQdVOyBX9hUgAUtWSLfZQXQop+J DyltM1GSVDj1DiGHHN2H8I04XVL55Ir4rbf74p3qIu1w4rOGV72GIBrkTsV8i7NHUDoH 8FuhCQMPRyH3zYVlUDJFSI6sYOtgXJrCQWHrDjj6J8AA6LYgnM3lVpZUc9b2Vxez4Rdr FpGtNdAHVQO5kC+TZrx47B3MkdYVp1QqSXbQhDq5Ap5b4HPEPSCWEgxFAxdohBg9Fz7U oqMg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=R70Ab/g7T2P6LaYaqQLBDrqh5nMr9JqDorsDVbZmxl8=; b=gn9YSSF9zpbGGAkYvn05n0nl3ZMCmPZzCRln3oCpixKJHT63kdNLgkL4a1EqIzAD00 uV9fAmcu56an85TO8zZpC1AORNhpQtR3GdCYHFQQHoNSKh0Cz0F2PQvWr90bR93b7BIN IsT4RQuT1urDWUVR5BiQuynaIAgpbCAnlu2Upk8bGaWfjC/LUMavYik9stzGs11/PGgH uWjZAdw7rYK4+hLj96oIJPKX832TZEj2Qa6xVJ5ogcu+i64ZIX6zrml8rL3Av6vsH0EL qzzFWYABilnA7k5sB1ZUWaE3UhBzEVJ7vpRewmNCQmjtTn84SN64zujjpiqL+182pU+r dQGw== X-Gm-Message-State: AOAM533EkZ8vKDzpvTwY7BhgwSEwOpNV91ERUGUcJ/JcNIaL3RWowhJv 0dZudejus4iqsB5bnM1/iGaflaN0ZoFALHgt X-Google-Smtp-Source: ABdhPJzP7uxfQUJ1DUcjOo4roPTkpRh96teutWvqxyd49bMoe6+eYgcKEenZN4hlnkPHCP1bv1NUxg== X-Received: by 2002:a7b:cf05:: with SMTP id l5mr5704028wmg.100.1589893762336; Tue, 19 May 2020 06:09:22 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p23sm1304990wma.17.2020.05.19.06.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:09:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: dpdk stable Date: Tue, 19 May 2020 14:03:21 +0100 Message-Id: <20200519130549.112823-66-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/null: remove redundant check' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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. Thanks. Luca Boccassi --- >From f662af80b15299bc08949511afff5a1b30e54e69 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 | 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 87a29b8535..beedd5f4b2 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -610,23 +610,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; - 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; } PMD_LOG(INFO, "Configure pmd_null: packet size is %d, " -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:47.175947291 +0100 +++ 0066-net-null-remove-redundant-check.patch 2020-05-19 14:04:44.224648517 +0100 @@ -1,14 +1,15 @@ -From c21a276bd8f3d4c5210ccd2074f7a87a7d00b3e4 Mon Sep 17 00:00:00 2001 +From f662af80b15299bc08949511afff5a1b30e54e69 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") -Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit ---