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 E87FDA0524 for ; Fri, 5 Feb 2021 12:20:19 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E20A04067B; Fri, 5 Feb 2021 12:20:19 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 3E1834067B for ; Fri, 5 Feb 2021 12:20:19 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id y187so5618098wmd.3 for ; Fri, 05 Feb 2021 03:20:19 -0800 (PST) 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=GkZLzNtj5HWb+XnoCd/sK5ZOz41k0H6Mge0X8FR4/8c=; b=dMdZaOqxfMqUn2OqP8PQ5nVM7JVMCTtlbSAbZw/UWIMXS5Ra/dfjTNC+1RoTaSRsAY b/DNd+U0TQ1N50MTzVSHqG2vGm8UaZXIhHF6w4DoRRKQ1cfUzG3PsYnpK5wuHH2yJmKd 6wOimUJen4jJR2xTEm1y12bRlxec/I/Fkc/aI8NfKBsWaQlEj1YpJqCqr7OsIVAjSEXF OTVcjmrI79D7aWdcScraJRMcFlDV5hOm5kZKorfeDHcxc8aZlcv4WCCx/tRedzlylZfc mwYS1FhzLHcRJXkUum4s7nBPrtuxeYFh/0uvo2ePfTnUfxL3iTJeTh9cHukJlOLgQNHR jhLg== 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=GkZLzNtj5HWb+XnoCd/sK5ZOz41k0H6Mge0X8FR4/8c=; b=twLcGr69NImBP1uAMNm8HJWB4vQzV1b/uzRl8LbJ88mqry2ONBt2qwfMc1YTOfbu0H hG4nw76+bk3d6g8aehLo+JNEMGc+AUzI8JXWFl0N09TeGHXD/UYERvl47EP+1FHqO8lX wek8MKiJcvQQynWZWchMjlzOyXGnuYf0YAeBApQ9RqNYcwTzfEEsn2DPZ9bDhjleOP3v IEfuaghLW6BJUDHNZ+5UJbnNBHf8y+AYXyLzvcjZp+TUWNxOAAPp8lTlmkaVIcPR2TMG GhWibivPNQW+y/Zr3bm4A2eBPv7H2qHjXjA1nLbLIUdHOFUxiV7PWUaT7b6FlsGcYniO UKNA== X-Gm-Message-State: AOAM531L1mSPeMAo2f0RHGgFZyMILSpkA8aVuaDl4oi6uA5HDCZ7d59H MXdVloJzGzCf7AgKp+OSwpY= X-Google-Smtp-Source: ABdhPJzi5IpmYNHq2nHw1wRUJAoG+U4S4ApakUPuhrbmfLC57WTnPWIT5y7MVfyAMDCnPYnLBXPfEw== X-Received: by 2002:a05:600c:2141:: with SMTP id v1mr3170033wml.5.1612524018986; Fri, 05 Feb 2021 03:20:18 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n9sm12208053wrq.41.2021.02.05.03.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:20:18 -0800 (PST) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: David Marchand , dpdk stable Date: Fri, 5 Feb 2021 11:15:02 +0000 Message-Id: <20210205111920.1272063-16-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.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 20.11.1 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 20.11.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 02/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/1256375dc2a32b677c542a81a8c00ba9b5d1a99f Thanks. Luca Boccassi --- >From 1256375dc2a32b677c542a81a8c00ba9b5d1a99f 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 4930d7d382..a32b1f3f37 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -1324,9 +1324,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.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:30.044620130 +0000 +++ 0016-net-pcap-remove-local-variable-shadowing-outer-one.patch 2021-02-05 11:18:28.598687152 +0000 @@ -1 +1 @@ -From a18f17470709d8a5f1cb918a8db6535890dee683 Mon Sep 17 00:00:00 2001 +From 1256375dc2a32b677c542a81a8c00ba9b5d1a99f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a18f17470709d8a5f1cb918a8db6535890dee683 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org