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-03 10:54:16 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-03 16:10:38 +0200
commitf960490fc8f9c347021868f6bd0ed1a078fc6da2 (patch)
tree3c998c1eabd8f3341c47a2227a334e495ce7ccf5 /target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch
parent4ec4dd2a118d124123e20a7af7958ba7d30785fe (diff)
downloadupstream-f960490fc8f9c347021868f6bd0ed1a078fc6da2.tar.gz
upstream-f960490fc8f9c347021868f6bd0ed1a078fc6da2.tar.bz2
upstream-f960490fc8f9c347021868f6bd0ed1a078fc6da2.zip
kernel: bump 4.14 to 4.14.60
Refreshed all patches Removed upstreamed patches: - 500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch 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 d8aea32b5a..9889a33cb1 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
-@@ -5096,7 +5096,7 @@ static bool e1000e_has_link(struct e1000
+@@ -5093,7 +5093,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) {
-@@ -5114,7 +5114,7 @@ static bool e1000e_has_link(struct e1000
+@@ -5111,7 +5111,7 @@ static bool e1000e_has_link(struct e1000
break;
case e1000_media_type_internal_serdes:
ret_val = hw->mac.ops.check_for_link(hw);