From: Benjamin Poirier Date: Fri, 21 Jul 2017 18:36:24 +0000 (-0700) Subject: e1000e: Fix wrong comment related to link detection X-Git-Tag: v4.1.12-124.31.3~1431 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=63e4d31670856f86c5f720c91e1908996a4ce0b0;p=users%2Fjedix%2Flinux-maple.git e1000e: Fix wrong comment related to link detection Reading e1000e_check_for_copper_link() shows that get_link_status is set to false after link has been detected. Therefore, it stays TRUE until then. Signed-off-by: Benjamin Poirier Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher Orabug: 27069012 (cherry picked from commit 65a29da1f5fd20fdebef3b959bef9b3660807b20) Signed-off-by: Jack Vogel Reviewed-by: Ethan Zhao --- diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index d3cf06eeee7d..972332d691b4 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -5073,7 +5073,7 @@ static bool e1000e_has_link(struct e1000_adapter *adapter) /* get_link_status is set on LSC (link status) interrupt or * Rx sequence error interrupt. get_link_status will stay - * false until the check_for_link establishes link + * true until the check_for_link establishes link * for copper adapters ONLY */ switch (hw->phy.media_type) { @@ -5091,7 +5091,7 @@ static bool e1000e_has_link(struct e1000_adapter *adapter) break; case e1000_media_type_internal_serdes: ret_val = hw->mac.ops.check_for_link(hw); - link_active = adapter->hw.mac.serdes_has_link; + link_active = hw->mac.serdes_has_link; break; default: case e1000_media_type_unknown: