From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B1811A0524 for ; Thu, 4 Feb 2021 12:30:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ABBC424072A; Thu, 4 Feb 2021 12:30:14 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 01F2324071E for ; Thu, 4 Feb 2021 12:30:12 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cpu-00052K-M5; Thu, 04 Feb 2021 11:30:10 +0000 From: Christian Ehrhardt To: Ferruh Yigit Cc: David Marchand , dpdk stable Date: Thu, 4 Feb 2021 12:27:40 +0100 Message-Id: <20210204112954.2488123-5-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/pcap: remove local variable shadowing outer one' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/9000db4b4eb6a9a61120280cd2e0bf2d6076a7a2 Thanks. Christian Ehrhardt --- >From 9000db4b4eb6a9a61120280cd2e0bf2d6076a7a2 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 19 Nov 2020 11:58:55 +0000 Subject: [PATCH] net/pcap: remove local variable shadowing outer one [ upstream commit a18f17470709d8a5f1cb918a8db6535890dee683 ] 'ret' is already defined in the function scope, removing the 'ret' in the block scope. Fixes: c9507cd0cada ("net/pcap: support physical interface MAC address") Signed-off-by: Ferruh Yigit Reviewed-by: David Marchand --- drivers/net/pcap/rte_eth_pcap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index fbff559c0a..f0c900ba88 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -1298,9 +1298,8 @@ eth_from_pcaps(struct rte_vdev_device *vdev, /* phy_mac arg is applied only only if "iface" devarg is provided */ if (rx_queues->phy_mac) { - int ret = eth_pcap_update_mac(rx_queues->queue[0].name, - eth_dev, vdev->device.numa_node); - if (ret == 0) + if (eth_pcap_update_mac(rx_queues->queue[0].name, + eth_dev, vdev->device.numa_node) == 0) internals->phy_mac = 1; } } -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:28.427837733 +0100 +++ 0005-net-pcap-remove-local-variable-shadowing-outer-one.patch 2021-02-04 12:04:27.786789492 +0100 @@ -1 +1 @@ -From a18f17470709d8a5f1cb918a8db6535890dee683 Mon Sep 17 00:00:00 2001 +From 9000db4b4eb6a9a61120280cd2e0bf2d6076a7a2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a18f17470709d8a5f1cb918a8db6535890dee683 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 4930d7d382..a32b1f3f37 100644 +index fbff559c0a..f0c900ba88 100644 @@ -22 +23 @@ -@@ -1324,9 +1324,8 @@ eth_from_pcaps(struct rte_vdev_device *vdev, +@@ -1298,9 +1298,8 @@ eth_from_pcaps(struct rte_vdev_device *vdev,