* Re: [PATCH] e1000e: Fix e1000_check_for_copper_link_ich8lan return value. [not found] <af44aaff-53e6-fb00-2dd6-d47396e56beb@gmx.de> @ 2018-01-10 1:34 ` Benjamin Poirier 2018-01-14 8:23 ` Greg KH 0 siblings, 1 reply; 3+ messages in thread From: Benjamin Poirier @ 2018-01-10 1:34 UTC (permalink / raw) To: rwarsow@gmx.de; +Cc: linux-kernel, stable, netdev, intel-wired-lan On 2018/01/10 01:29, rwarsow@gmx.de wrote: > hallo > > any chance to get this patch into stable and 4.15 ? > > https://marc.info/?l=linux-kernel&m=151297726823919&w=2 > It was part of the last network pull request and should be included in the next mainline release as 4110e02eb45e e1000e: Fix e1000_check_for_copper_link_ich8lan return value. It's needed in stable branches that include commit 19110cfbb34d ("e1000e: Separate signaling for link check/link up"): linux-4.14.y linux-4.9.y linux-4.4.y linux-4.1.y linux-3.18.y ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] e1000e: Fix e1000_check_for_copper_link_ich8lan return value. 2018-01-10 1:34 ` [PATCH] e1000e: Fix e1000_check_for_copper_link_ich8lan return value Benjamin Poirier @ 2018-01-14 8:23 ` Greg KH 0 siblings, 0 replies; 3+ messages in thread From: Greg KH @ 2018-01-14 8:23 UTC (permalink / raw) To: Benjamin Poirier Cc: rwarsow@gmx.de, linux-kernel, stable, netdev, intel-wired-lan On Wed, Jan 10, 2018 at 10:34:43AM +0900, Benjamin Poirier wrote: > On 2018/01/10 01:29, rwarsow@gmx.de wrote: > > hallo > > > > any chance to get this patch into stable and 4.15 ? > > > > https://marc.info/?l=linux-kernel&m=151297726823919&w=2 > > > > It was part of the last network pull request and should be included in > the next mainline release as > 4110e02eb45e e1000e: Fix e1000_check_for_copper_link_ich8lan return value. > > It's needed in stable branches that include commit 19110cfbb34d > ("e1000e: Separate signaling for link check/link up"): > linux-4.14.y > linux-4.9.y > linux-4.4.y > linux-4.1.y > linux-3.18.y Now queued up, thanks! greg k-h ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <20171208114552.5f517fd3@leda>]
* [PATCH] e1000e: Fix e1000_check_for_copper_link_ich8lan return value. [not found] <20171208114552.5f517fd3@leda> @ 2017-12-11 7:26 ` Benjamin Poirier 0 siblings, 0 replies; 3+ messages in thread From: Benjamin Poirier @ 2017-12-11 7:26 UTC (permalink / raw) To: Jeff Kirsher Cc: Ben Hutchings, Christian Hesse, Gabriel C, intel-wired-lan, netdev, linux-kernel, stable 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: Christian Hesse <list@eworm.de> Reported-by: Gabriel 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") Tested-by: Christian Hesse <list@eworm.de> Signed-off-by: Benjamin Poirier <bpoirier@suse.com> --- drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index d6d4ed7acf03..31277d3bb7dc 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -1367,6 +1367,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) * 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) { @@ -1382,7 +1385,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 @@ -1613,10 +1616,12 @@ 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 ret_val; + return 1; } static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter) -- 2.15.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-14 8:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <af44aaff-53e6-fb00-2dd6-d47396e56beb@gmx.de>
2018-01-10 1:34 ` [PATCH] e1000e: Fix e1000_check_for_copper_link_ich8lan return value Benjamin Poirier
2018-01-14 8:23 ` Greg KH
[not found] <20171208114552.5f517fd3@leda>
2017-12-11 7:26 ` Benjamin Poirier
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).