On Tue, 2017-11-28 at 11:23 +0100, Greg Kroah-Hartman wrote:
> 4.4-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: Benjamin Poirier <bpoir...@suse.com>
>
> commit 19110cfbb34d4af0cdfe14cd243f3b09dc95b013 upstream.
[...]
> --- a/drivers/net/ethernet/intel/e1000e/mac.c
> +++ b/drivers/net/ethernet/intel/e1000e/mac.c
> @@ -410,6 +410,9 @@ void e1000e_clear_hw_cntrs_base(struct e
> * 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).
> **/
> s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
> {
[...]
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -5017,7 +5017,7 @@ static bool e1000e_has_link(struct e1000
> > case e1000_media_type_copper:
> > if (hw->mac.get_link_status) {
> > ret_val = hw->mac.ops.check_for_link(hw);
> > - link_active = !hw->mac.get_link_status;
> > + link_active = ret_val > 0;
> > } else {
> > link_active = true;
> > }
As this change in e1000e_has_link() is conditional only on the media
type, doesn't e1000_check_for_copper_link_ich8lan() also need to be
changed to return 1 for link up?
Ben.
--
Ben Hutchings
Software Developer, Codethink Ltd.
