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 29A36A0555 for ; Wed, 19 Feb 2020 16:57:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1F2581B951; Wed, 19 Feb 2020 16:57:37 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id CCAFF1B951 for ; Wed, 19 Feb 2020 16:57:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582127855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rIsx3YJ0fMvYQjgU4ESZWcO02/btVtvBLMMaRIEzuwI=; b=VCnsMw3vZRGcGgy5Vpz5xOh0N8XXYGULQSjz+M/DJ12xsLbZ47EBSX04UMKvvYJ9YRxfwi 21kXHHfmmlzYLeSkz+tVd1604HkfjBnTODH86UY1JOcI9bA7uXhVY7DFyX4H2WbIfqB4pl GAoQA/FYxd56esrDjwJS3LQo8M5gzfE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-193-UyHi3wNOMiGGa_Gh_lj2eg-1; Wed, 19 Feb 2020 10:57:31 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 37C34100550E; Wed, 19 Feb 2020 15:57:30 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id C939B859A5; Wed, 19 Feb 2020 15:57:25 +0000 (UTC) From: Kevin Traynor To: Shougang Wang Cc: Xiaolong Ye , dpdk stable Date: Wed, 19 Feb 2020 15:55:59 +0000 Message-Id: <20200219155607.20495-14-ktraynor@redhat.com> In-Reply-To: <20200219155607.20495-1-ktraynor@redhat.com> References: <20200219155607.20495-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: UyHi3wNOMiGGa_Gh_lj2eg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/ixgbe: remove dead code' has been queued to LTS release 18.11.7 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 LTS release 18.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/25/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 rebasi= ng (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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/7c7b8326c127e09367= da43d9f59549fc0f17aa7f Thanks. Kevin. --- >From 7c7b8326c127e09367da43d9f59549fc0f17aa7f 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_eth= dev.c index fc7fc68120..e06cc433c7 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -4097,10 +4097,7 @@ ixgbe_wait_for_link_up(struct ixgbe_hw *hw) { #ifdef RTE_EXEC_ENV_FREEBSD -=09const int nb_iter =3D 25; -#else -=09const int nb_iter =3D 0; -#endif =09int err, i, link_up =3D 0; =09uint32_t speed =3D 0; +=09const int nb_iter =3D 25; =20 =09for (i =3D 0; i < nb_iter; i++) { @@ -4112,5 +4109,10 @@ ixgbe_wait_for_link_up(struct ixgbe_hw *hw) =09=09msec_delay(200); =09} + =09return 0; +#else +=09RTE_SET_USED(hw); +=09return 0; +#endif } =20 --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-19 15:43:50.446823501 +0000 +++ 0014-net-ixgbe-remove-dead-code.patch=092020-02-19 15:43:49.746141688 += 0000 @@ -1 +1 @@ -From e07e2ca9e565ebb6fa7c70e3b9718046a011cc7a Mon Sep 17 00:00:00 2001 +From 7c7b8326c127e09367da43d9f59549fc0f17aa7f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e07e2ca9e565ebb6fa7c70e3b9718046a011cc7a ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 7ea1962f60..2a248a3f27 100644 +index fc7fc68120..e06cc433c7 100644 @@ -22 +23 @@ -@@ -4129,11 +4129,8 @@ ixgbe_wait_for_link_up(struct ixgbe_hw *hw) +@@ -4097,10 +4097,7 @@ ixgbe_wait_for_link_up(struct ixgbe_hw *hw) @@ -29,2 +30 @@ - =09int err, i; - =09bool link_up =3D false; + =09int err, i, link_up =3D 0; @@ -35 +35 @@ -@@ -4145,5 +4142,10 @@ ixgbe_wait_for_link_up(struct ixgbe_hw *hw) +@@ -4112,5 +4109,10 @@ ixgbe_wait_for_link_up(struct ixgbe_hw *hw)