[dpdk-stable] patch 'net/ixgbe: remove dead code' has been queued to LTS release 18.11.7

[Kevin Traynor]

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 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/7c7b8326c127e09367da43d9f59549fc0f17aa7f

Thanks.

Kevin.

---
>From 7c7b8326c127e09367da43d9f59549fc0f17aa7f Mon Sep 17 00:00:00 2001
From: Shougang Wang <shougangx.wang at intel.com>
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 <shougangx.wang at intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
---
 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 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
-	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++) {
@@ -4112,5 +4109,10 @@ ixgbe_wait_for_link_up(struct ixgbe_hw *hw)
 		msec_delay(200);
 	}
+
 	return 0;
+#else
+	RTE_SET_USED(hw);
+	return 0;
+#endif
 }
 
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-19 15:43:50.446823501 +0000
+++ 0014-net-ixgbe-remove-dead-code.patch	2020-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 at 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 @@
- 	int err, i;
- 	bool link_up = false;
+ 	int err, i, link_up = 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)