releases/3.18.85/e1000e-fix-return-value-test.patch

   1 From d3509f8bc7b0560044c15f0e3ecfde1d9af757a6 Mon Sep 17 00:00:00 2001
   2 From: Benjamin Poirier <bpoirier@suse.com>
   3 Date: Fri, 21 Jul 2017 11:36:25 -0700
   4 Subject: e1000e: Fix return value test
   5
   6 From: Benjamin Poirier <bpoirier@suse.com>
   7
   8 commit d3509f8bc7b0560044c15f0e3ecfde1d9af757a6 upstream.
   9
  10 All the helpers return -E1000_ERR_PHY.
  11
  12 Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
  13 Tested-by: Aaron Brown <aaron.f.brown@intel.com>
  14 Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  15 Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17
  18 ---
  19  drivers/net/ethernet/intel/e1000e/netdev.c |    2 +-
  20  1 file changed, 1 insertion(+), 1 deletion(-)
  21
  22 --- a/drivers/net/ethernet/intel/e1000e/netdev.c
  23 +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
  24 @@ -4862,7 +4862,7 @@ static bool e1000e_has_link(struct e1000
  25                 break;
  26         }
  27
  28 -       if ((ret_val == E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) &&
  29 +       if ((ret_val == -E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) &&
  30             (er32(CTRL) & E1000_PHY_CTRL_GBE_DISABLE)) {
  31                 /* See e1000_kmrn_lock_loss_workaround_ich8lan() */
  32                 e_info("Gigabit has been disabled, downgrading speed\n");