Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55492dc6 authored by Benjamin Poirier's avatar Benjamin Poirier Committed by Greg Kroah-Hartman
Browse files

e1000e: Fix e1000_check_for_copper_link_ich8lan return value. 



commit 4110e02eb45ea447ec6f5459c9934de0a273fb91 upstream.

e1000e_check_for_copper_link() and e1000_check_for_copper_link_ich8lan()
are the two functions that may be assigned to mac.ops.check_for_link when
phy.media_type == e1000_media_type_copper. Commit 19110cfbb34d ("e1000e:
Separate signaling for link check/link up") changed the meaning of the
return value of check_for_link for copper media but only adjusted the first
function. This patch adjusts the second function likewise.

Reported-by: default avatarChristian Hesse <list@eworm.de>
Reported-by: default avatarGabriel C <nix.or.die@gmail.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=198047


Fixes: 19110cfbb34d ("e1000e: Separate signaling for link check/link up")
Signed-off-by: default avatarBenjamin Poirier <bpoirier@suse.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Tested-by: default avatarChristian Hesse <list@eworm.de>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c07fbcb

drivers/net/ethernet/intel/e1000e/ich8lan.c

+8 −3
Original line number Diff line number Diff line
@@ -1299,6 +1299,9 @@ out: 
 *  Checks to see of the link status of the hardware has changed.  If a

 *  change in link status has been detected, then we read the PHY registers

 *  to get the current speed/duplex if link exists.

 *

 *  Returns a negative error code (-E1000_ERR_*) or 0 (link down) or 1 (link

 *  up).

 **/

static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)

{
@@ -1313,7 +1316,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) 
	 * Change or Rx Sequence Error interrupt.

	 */

	if (!mac->get_link_status)

		return 0;

		return 1;



	/* First we want to see if the MII Status Register reports

	 * link.  If so, then we want to get the current speed/duplex
@@ -1452,12 +1455,14 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) 
	 * different link partner.

	 */

	ret_val = e1000e_config_fc_after_link_up(hw);

	if (ret_val)

	if (ret_val) {

		e_dbg("Error configuring flow control\n");



		return ret_val;

	}



	return 1;

}



static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)

{

	struct e1000_hw *hw = &adapter->hw;