mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 22:44:27 -05:00 
			
		
		
		
	Refreshed all patches. Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
		
			
				
	
	
		
			44 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			44 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From patchwork Fri Jul 21 18:36:24 2017
 | 
						|
Content-Type: text/plain; charset="utf-8"
 | 
						|
MIME-Version: 1.0
 | 
						|
Content-Transfer-Encoding: 7bit
 | 
						|
Subject: [2/5] e1000e: Fix wrong comment related to link detection
 | 
						|
From: Benjamin Poirier <bpoirier@suse.com>
 | 
						|
X-Patchwork-Id: 9857489
 | 
						|
Message-Id: <20170721183627.13373-2-bpoirier@suse.com>
 | 
						|
To: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
 | 
						|
Cc: Lennart Sorensen <lsorense@csclub.uwaterloo.ca>,
 | 
						|
 intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
 | 
						|
 linux-kernel@vger.kernel.org
 | 
						|
Date: Fri, 21 Jul 2017 11:36:24 -0700
 | 
						|
 | 
						|
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 <bpoirier@suse.com>
 | 
						|
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
 | 
						|
---
 | 
						|
 drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++--
 | 
						|
 1 file changed, 2 insertions(+), 2 deletions(-)
 | 
						|
 | 
						|
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
 | 
						|
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
 | 
						|
@@ -5082,7 +5082,7 @@ static bool e1000e_has_link(struct e1000
 | 
						|
 
 | 
						|
 	/* 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) {
 | 
						|
@@ -5100,7 +5100,7 @@ static bool e1000e_has_link(struct e1000
 | 
						|
 		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:
 |