From patchwork Thu Nov 19 11:58:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 84376 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0D110A04DD; Thu, 19 Nov 2020 13:01:17 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 460B7C926; Thu, 19 Nov 2020 12:59:24 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 494EDC900; Thu, 19 Nov 2020 12:59:18 +0100 (CET) IronPort-SDR: nL4IB10mFe8t5JcSR21jOXaMLawAuhqCuY6rYM73504ZKFn1kBoYBVwzTTqvyNySplm0i3iBDv jd1LuRsjBTyA== X-IronPort-AV: E=McAfee;i="6000,8403,9809"; a="170494407" X-IronPort-AV: E=Sophos;i="5.77,490,1596524400"; d="scan'208";a="170494407" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Nov 2020 03:59:17 -0800 IronPort-SDR: JCXeo9sgDQo5/oZgX+tdjG4LLcevcfydOqJNPr9zVzSbALa4F4p7jpJLyMF6aUstYJkYoakzYR pliHeRyuyjSA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,490,1596524400"; d="scan'208";a="341665203" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.222.180]) by orsmga002.jf.intel.com with ESMTP; 19 Nov 2020 03:59:16 -0800 From: Ferruh Yigit To: dev@dpdk.org, Chas Williams , "Min Hu (Connor)" , Tomasz Kulasek , Declan Doherty Cc: Ferruh Yigit , stable@dpdk.org Date: Thu, 19 Nov 2020 11:58:56 +0000 Message-Id: <20201119115900.4095566-7-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201119115900.4095566-1-ferruh.yigit@intel.com> References: <20200824094021.2323605-1-ferruh.yigit@intel.com> <20201119115900.4095566-1-ferruh.yigit@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [v21.02 v3 06/10] net/bonding: remove local variable shadowing outer one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" '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") Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit Reviewed-by: David Marchand Acked-by: Min Hu (Connor) --- Cc: tomaszx.kulasek@intel.com --- 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;