aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-09 17:18:12 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-10 18:43:59 +0200
commit67f91dfa51506d2b72ef10adfdb001bfddf35bd7 (patch)
treeefd76764754c260512fb53a2ff1cc4462050dbc2 /target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch
parente4a57509311e5805810da50852a7d48569952146 (diff)
downloadupstream-67f91dfa51506d2b72ef10adfdb001bfddf35bd7.tar.gz
upstream-67f91dfa51506d2b72ef10adfdb001bfddf35bd7.tar.bz2
upstream-67f91dfa51506d2b72ef10adfdb001bfddf35bd7.zip
kernel: bump 4.14 to 4.14.62
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>
Diffstat (limited to 'target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch')
-rw-r--r--target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch b/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch
index 9889a33cb1..54858657cb 100644
--- a/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch
+++ b/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch
@@ -23,7 +23,7 @@ Tested-by: Aaron Brown <aaron.f.brown@intel.com>
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
-@@ -5093,7 +5093,7 @@ static bool e1000e_has_link(struct e1000
+@@ -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
@@ -32,7 +32,7 @@ Tested-by: Aaron Brown <aaron.f.brown@intel.com>
* for copper adapters ONLY
*/
switch (hw->phy.media_type) {
-@@ -5111,7 +5111,7 @@ static bool e1000e_has_link(struct e1000
+@@ -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);