You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From patchwork Fri Jul 21 18:36:25 2017
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
Subject: [3/5] e1000e: Fix return value test
|
|
From: Benjamin Poirier <bpoirier@suse.com>
|
|
X-Patchwork-Id: 9857495
|
|
Message-Id: <20170721183627.13373-3-bpoirier@suse.com>
|
|
To: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
|
|
Cc: Lennart Sorensen <lsorense@csclub.uwaterloo.ca>,
|
|
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
|
|
linux-kernel@vger.kernel.org
|
|
Date: Fri, 21 Jul 2017 11:36:25 -0700
|
|
|
|
All the helpers return -E1000_ERR_PHY.
|
|
|
|
Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
|
|
---
|
|
drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
|
|
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
|
|
@@ -5074,7 +5074,7 @@ static bool e1000e_has_link(struct e1000
|
|
break;
|
|
}
|
|
|
|
- if ((ret_val == E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) &&
|
|
+ if ((ret_val == -E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) &&
|
|
(er32(CTRL) & E1000_PHY_CTRL_GBE_DISABLE)) {
|
|
/* See e1000_kmrn_lock_loss_workaround_ich8lan() */
|
|
e_info("Gigabit has been disabled, downgrading speed\n");
|