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 89054A0553 for ; Mon, 17 Feb 2020 18:46:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 833B41DA12; Mon, 17 Feb 2020 18:46:32 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id BA4A31DABD for ; Mon, 17 Feb 2020 18:46:30 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id y11so20776327wrt.6 for ; Mon, 17 Feb 2020 09:46:30 -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=BSwECcMpSNm4pyti51GaPg7IoSW8GgM7QEakH4t9Avg=; b=pdFEVKEyb/WQXP1onO7kkF0IQwt1OHxS9F5x8xGxjziOzE9JPliID1IxTPLTGm8YxK gfglwS9lkbwThvwmij5Y/iXvXLBvsHcC8k/odc4asSQZAN02sMIuCMPDKhUeUkrp1O9i tFVv7/vZg45YXvXep2TPzTkLQZXwZg7kha1aJ25DQIuPCwniLWyQrIZMPBiTaeXjVBGb FyYMyuxiCoUttIw0Gk/Nhpe22FN861+i7YUWZgaaJGT0fCEw/7lHbXtvv6mhtFadI7Pd FKgBhHK6AIrKK0E5hcu5w5JhOJcpO8K+pWPSGmBWTYjbVtojUqMEEDzNR2nfBqPG7LcG 1ktA== 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=BSwECcMpSNm4pyti51GaPg7IoSW8GgM7QEakH4t9Avg=; b=BqfTYUrflBgJlh62lsCmxvPm0aUl7Y6R+cbdCg5MFKKt2TI2CDh3R1WvXiBswQJBqI Bjwd1Ccka6YQIw0GQfe8fEnJKj52xdyaAe1ousD04CZ6dA9wCAA8WM/2SYlNKTl8FHrb bkqCn/tkuB0yiKJhpxo4Boo7ztZ+vlEiJYyYvElGmfHfJKKnvB2c0yM3PKrz3oMjcY3W Dd6JRCPzYHW7ym4LvVJNWDDYWsMSPbL5jenYW6xzl+bITCa53vqh/8jgcjDX5kDq9z37 yfzX2atxLgw3jjFOOBb4lkMGTG3IBMWXMsiBSG/e5diESWOLXTERJgnhOs1G6YgkTs9U a5Jw== X-Gm-Message-State: APjAAAWAtjvwS3pzYm4ZiHoxv88UEk8F/HVAMYioTcVc0ZqLZLtvNpof SCJkhAIoentpwgIE3xHiLqg= X-Google-Smtp-Source: APXvYqwZ3g/26w/h2gxeqGKHZvNmNo9N+6BN4ey9VpJiW74If6x1Jx7V0myLkLJ4mAs/OUOliAC64g== X-Received: by 2002:a5d:45cc:: with SMTP id b12mr22474595wrs.424.1581961590499; Mon, 17 Feb 2020 09:46:30 -0800 (PST) Received: from localhost (userh634.uk.uudial.com. [194.69.103.7]) by smtp.gmail.com with ESMTPSA id j15sm2097176wrp.9.2020.02.17.09.46.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 09:46:30 -0800 (PST) From: luca.boccassi@gmail.com To: Shougang Wang Cc: Xiaolong Ye , dpdk stable Date: Mon, 17 Feb 2020 17:45:17 +0000 Message-Id: <20200217174546.25334-25-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200217174546.25334-1-luca.boccassi@gmail.com> References: <20200211112216.3929-190-luca.boccassi@gmail.com> <20200217174546.25334-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: remove dead code' has been queued to stable release 19.11.1 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.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/19/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 6cb0c7297fb01dc1fcf5d2910875b8986c0ee912 Mon Sep 17 00:00:00 2001 From: Shougang Wang Date: Tue, 11 Feb 2020 09:26:22 +0000 Subject: [PATCH] net/ixgbe: remove dead code [ upstream commit e07e2ca9e565ebb6fa7c70e3b9718046a011cc7a ] This patch fixes (Logically dead code) coverity issue. Coverity issue: 353624 Fixes: ba7b12dd64e4 ("net/ixgbe: fix link up in FreeBSD") Signed-off-by: Shougang Wang Acked-by: Xiaolong Ye --- drivers/net/ixgbe/ixgbe_ethdev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index b2f723f0b6..1646b217a1 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -4125,12 +4125,9 @@ static int ixgbe_wait_for_link_up(struct ixgbe_hw *hw) { #ifdef RTE_EXEC_ENV_FREEBSD - const int nb_iter = 25; -#else - const int nb_iter = 0; -#endif int err, i, link_up = 0; uint32_t speed = 0; + const int nb_iter = 25; for (i = 0; i < nb_iter; i++) { err = ixgbe_check_link(hw, &speed, &link_up, 0); @@ -4140,7 +4137,12 @@ ixgbe_wait_for_link_up(struct ixgbe_hw *hw) return 0; msec_delay(200); } + return 0; +#else + RTE_SET_USED(hw); + return 0; +#endif } /* return 0 means link status changed, -1 means not changed */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-17 17:00:16.019010063 +0000 +++ 0025-net-ixgbe-remove-dead-code.patch 2020-02-17 17:00:15.323950682 +0000 @@ -1,13 +1,14 @@ -From e07e2ca9e565ebb6fa7c70e3b9718046a011cc7a Mon Sep 17 00:00:00 2001 +From 6cb0c7297fb01dc1fcf5d2910875b8986c0ee912 Mon Sep 17 00:00:00 2001 From: Shougang Wang Date: Tue, 11 Feb 2020 09:26:22 +0000 Subject: [PATCH] net/ixgbe: remove dead code +[ upstream commit e07e2ca9e565ebb6fa7c70e3b9718046a011cc7a ] + This patch fixes (Logically dead code) coverity issue. Coverity issue: 353624 Fixes: ba7b12dd64e4 ("net/ixgbe: fix link up in FreeBSD") -Cc: stable@dpdk.org Signed-off-by: Shougang Wang Acked-by: Xiaolong Ye @@ -16,10 +17,10 @@ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c -index 7ea1962f60..2a248a3f27 100644 +index b2f723f0b6..1646b217a1 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c -@@ -4128,13 +4128,10 @@ static int +@@ -4125,12 +4125,9 @@ static int ixgbe_wait_for_link_up(struct ixgbe_hw *hw) { #ifdef RTE_EXEC_ENV_FREEBSD @@ -27,14 +28,13 @@ -#else - const int nb_iter = 0; -#endif - int err, i; - bool link_up = false; + int err, i, link_up = 0; uint32_t speed = 0; + const int nb_iter = 25; for (i = 0; i < nb_iter; i++) { err = ixgbe_check_link(hw, &speed, &link_up, 0); -@@ -4144,7 +4141,12 @@ ixgbe_wait_for_link_up(struct ixgbe_hw *hw) +@@ -4140,7 +4137,12 @@ ixgbe_wait_for_link_up(struct ixgbe_hw *hw) return 0; msec_delay(200); }