Benjamin Poirier 8d65ed
From: Carolyn Wyborny <carolyn.wyborny@intel.com>
Benjamin Poirier 8d65ed
Date: Fri, 14 Jul 2017 09:10:07 -0400
Benjamin Poirier 8d65ed
Subject: i40e: Fix for unused value issue found by static analysis
Benjamin Poirier 8d65ed
Patch-mainline: v4.14-rc1
Benjamin Poirier 8d65ed
Git-commit: 19279235bea221798e3307a8bec2c02559cab0c5
Benjamin Poirier 8d65ed
References: bsc#1056658 FATE#322188 bsc#1056662 FATE#322186
Benjamin Poirier 8d65ed
Benjamin Poirier 8d65ed
This patch fixes an issue where an error return value is
Benjamin Poirier 8d65ed
set, but without an immediate exit, the value can be overwritten
Benjamin Poirier 8d65ed
by the following code execution.  The condition  at this point
Benjamin Poirier 8d65ed
is not fatal, so remove the error assignment and comment the
Benjamin Poirier 8d65ed
intent for future code maintainers
Benjamin Poirier 8d65ed
Benjamin Poirier 8d65ed
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Benjamin Poirier 8d65ed
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Benjamin Poirier 8d65ed
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Benjamin Poirier 8d65ed
Acked-by: Benjamin Poirier <bpoirier@suse.com>
Benjamin Poirier 8d65ed
---
Benjamin Poirier 8d65ed
 drivers/net/ethernet/intel/i40e/i40e_main.c |    4 +++-
Benjamin Poirier 8d65ed
 1 file changed, 3 insertions(+), 1 deletion(-)
Benjamin Poirier 8d65ed
Benjamin Poirier 8d65ed
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
Benjamin Poirier 8d65ed
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
Benjamin Poirier 8d65ed
@@ -9884,13 +9884,15 @@ static int i40e_add_vsi(struct i40e_vsi
Benjamin Poirier 8d65ed
 			 */
Benjamin Poirier 8d65ed
 			ret = i40e_vsi_config_tc(vsi, enabled_tc);
Benjamin Poirier 8d65ed
 			if (ret) {
Benjamin Poirier 8d65ed
+				/* Single TC condition is not fatal,
Benjamin Poirier 8d65ed
+				 * message and continue
Benjamin Poirier 8d65ed
+				 */
Benjamin Poirier 8d65ed
 				dev_info(&pf->pdev->dev,
Benjamin Poirier 8d65ed
 					 "failed to configure TCs for main VSI tc_map 0x%08x, err %s aq_err %s\n",
Benjamin Poirier 8d65ed
 					 enabled_tc,
Benjamin Poirier 8d65ed
 					 i40e_stat_str(&pf->hw, ret),
Benjamin Poirier 8d65ed
 					 i40e_aq_str(&pf->hw,
Benjamin Poirier 8d65ed
 						    pf->hw.aq.asq_last_status));
Benjamin Poirier 8d65ed
-				ret = -ENOENT;
Benjamin Poirier 8d65ed
 			}
Benjamin Poirier 8d65ed
 		}
Benjamin Poirier 8d65ed
 		break;