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 1A176A0524 for ; Fri, 5 Feb 2021 12:20:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 130AD1606B6; Fri, 5 Feb 2021 12:20:22 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 9833F1606B6 for ; Fri, 5 Feb 2021 12:20:20 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id 190so5727830wmz.0 for ; Fri, 05 Feb 2021 03:20:20 -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=Safb5EOS9WUHJ+wp5qfOYz0kDDlm+DFbCYyMyFb4WAE=; b=tf7fhQMVklvujeW99fnjtftr9nVIkt52Qz3EF2Ch9XuBzyANw4IxLTDK8YofnrpiwL aBo+TrV3Bt0bPmXTW/wDd29TrD2TeAHZGY/VK5uZkNwEHM6IQ8Tnd2evifKTd86q8iCr Xla6UY9f0uoSmaZ5kL4XO13WqOvLhjNB7HV99vMhStj2UtO94dBYBKjZJ+sdfQP4SvVP b79mEllr3PmDScGbaU+OeaL7pt88Mn40SiqyyQ7erOxbWHme55S7wntOepL8Ov1AiUXf c+6tUqkAMz6wy78ZGfb3HkpCQY/LyrnZnxi8PFgGK/f6sJo0LVprZymo1wuZmXJ0F51x dW5Q== 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=Safb5EOS9WUHJ+wp5qfOYz0kDDlm+DFbCYyMyFb4WAE=; b=IyRHavEC3Sa23wFYgYYXgbRedo/lzelXOfjScmFMrHYqHGJ8CNs7Mb5zbtOtJPDlt7 sM5txEHjxsdRRh2Ts3P+bAOUIO3BWtzmMRO2hZJzFO5nJ6etqF1NwJdyFvgIewjxGjBc H+uPmaYX3gE5kni05E5bL+YsDiapbsz+aARpBrYf7jo5D/BQe85wmzcgrClDyhkC7Ysz O/AnHqmCvhX3VTkqE1Pqxt3qybDzExUmv2INkKz7YGrHb1EUEUAKrO/uHbwaGadu8+cY PLGlyLxitUygb35e/S0gK59KiDrNtiWH7TQbX7qMeklml8ZuUF2bYpVwh3p+7uM7Z0sB hoHA== X-Gm-Message-State: AOAM530GYA3b48gynI13CjkuUe1Bv09YWsu2FqtiwbyLBFjP1fbY5nKb NML1X+0caahemgb/U2OGtXI= X-Google-Smtp-Source: ABdhPJwx+l2f6aFZKhMn+iN62ryYedK1DRGvxckMRMV5wUbwth8hT7Y4Kr0kwPwZlzpMMOFDA90LiA== X-Received: by 2002:a7b:c95a:: with SMTP id i26mr3183160wml.164.1612524020417; Fri, 05 Feb 2021 03:20:20 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n10sm12102230wro.39.2021.02.05.03.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:20:19 -0800 (PST) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: David Marchand , Min Hu , dpdk stable Date: Fri, 5 Feb 2021 11:15:03 +0000 Message-Id: <20210205111920.1272063-17-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/bonding: 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/218fd70ce7e47126200dfecf5996b7c245d4a423 Thanks. Luca Boccassi --- >From 218fd70ce7e47126200dfecf5996b7c245d4a423 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 19 Nov 2020 11:58:56 +0000 Subject: [PATCH] net/bonding: remove local variable shadowing outer one [ upstream commit b92b0018b17d3fb86392da58692a30b1c0997d92 ] 'retval' is already defined in the function scope, removing the 'retval' in the block scope. Fixes: 112891cd27e5 ("net/bonding: add dedicated HW queues for LACP control") Signed-off-by: Ferruh Yigit Reviewed-by: David Marchand Acked-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_8023ad.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index 67ca0730fa..5fe004e551 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -1334,8 +1334,7 @@ bond_mode_8023ad_handle_slow_pkt(struct bond_dev_private *internals, rte_eth_macaddr_get(slave_id, &m_hdr->eth_hdr.s_addr); if (internals->mode4.dedicated_queues.enabled == 0) { - int retval = rte_ring_enqueue(port->tx_ring, pkt); - if (retval != 0) { + if (rte_ring_enqueue(port->tx_ring, pkt) != 0) { /* reset timer */ port->rx_marker_timer = 0; wrn = WRN_TX_QUEUE_FULL; @@ -1355,8 +1354,7 @@ bond_mode_8023ad_handle_slow_pkt(struct bond_dev_private *internals, } } else if (likely(subtype == SLOW_SUBTYPE_LACP)) { if (internals->mode4.dedicated_queues.enabled == 0) { - int retval = rte_ring_enqueue(port->rx_ring, pkt); - if (retval != 0) { + if (rte_ring_enqueue(port->rx_ring, pkt) != 0) { /* If RX fing full free lacpdu message and drop packet */ wrn = WRN_RX_QUEUE_FULL; goto free_out; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:30.083006443 +0000 +++ 0017-net-bonding-remove-local-variable-shadowing-outer-on.patch 2021-02-05 11:18:28.598687152 +0000 @@ -1 +1 @@ -From b92b0018b17d3fb86392da58692a30b1c0997d92 Mon Sep 17 00:00:00 2001 +From 218fd70ce7e47126200dfecf5996b7c245d4a423 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b92b0018b17d3fb86392da58692a30b1c0997d92 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org