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

[luca.boccassi at gmail.com]

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 <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 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 <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")
-Cc: stable at dpdk.org
 
 Signed-off-by: Shougang Wang <shougangx.wang at intel.com>
 Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
@@ -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);
  	}