| From d3509f8bc7b0560044c15f0e3ecfde1d9af757a6 Mon Sep 17 00:00:00 2001 |
| From: Benjamin Poirier <bpoirier@suse.com> |
| Date: Fri, 21 Jul 2017 11:36:25 -0700 |
| Subject: e1000e: Fix return value test |
| |
| From: Benjamin Poirier <bpoirier@suse.com> |
| |
| commit d3509f8bc7b0560044c15f0e3ecfde1d9af757a6 upstream. |
| |
| All the helpers return -E1000_ERR_PHY. |
| |
| Signed-off-by: Benjamin Poirier <bpoirier@suse.com> |
| Tested-by: Aaron Brown <aaron.f.brown@intel.com> |
| Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
| Signed-off-by: Amit Pundir <amit.pundir@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| 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 |
| @@ -4862,7 +4862,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"); |
