target/linux/generic/pending-4.9/190-3-5-e1000e-Fix-return-value-test.patch

   1 From patchwork Fri Jul 21 18:36:25 2017
   2 Content-Type: text/plain; charset="utf-8"
   3 MIME-Version: 1.0
   4 Content-Transfer-Encoding: 7bit
   5 Subject: [3/5] e1000e: Fix return value test
   6 From: Benjamin Poirier <bpoirier@suse.com>
   7 X-Patchwork-Id: 9857495
   8 Message-Id: <20170721183627.13373-3-bpoirier@suse.com>
   9 To: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  10 Cc: Lennart Sorensen <lsorense@csclub.uwaterloo.ca>,
  11  intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
  12  linux-kernel@vger.kernel.org
  13 Date: Fri, 21 Jul 2017 11:36:25 -0700
  14
  15 All the helpers return -E1000_ERR_PHY.
  16
  17 Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
  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 @@ -5074,7 +5074,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");