aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.19/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-04-15 15:11:54 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-04-16 13:23:11 +0200
commit3c3825436e0e4107acd6ef722732a6444a1f7e0b (patch)
tree9633ddb14fc7a450c9d85e3bfd30098a0ff7065c /target/linux/generic/backport-4.19/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch
parente31d158c4d03f51c728d8adc38fd73314171318e (diff)
downloadupstream-3c3825436e0e4107acd6ef722732a6444a1f7e0b.tar.gz
upstream-3c3825436e0e4107acd6ef722732a6444a1f7e0b.tar.bz2
upstream-3c3825436e0e4107acd6ef722732a6444a1f7e0b.zip
kernel: bump 4.19 to 4.19.115
Refreshed all patches. Remove upstreamed: - 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch - 184-USB-serial-option-add-Wistron-Neweb-D19Q1.patch Fixes: - CVE-2020-8647 - CVE-2020-8648 (potentially) - CVE-2020-8649 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.19/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch')
-rw-r--r--target/linux/generic/backport-4.19/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-4.19/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch b/target/linux/generic/backport-4.19/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch
index 00ef6b7a1d..d9c4b4ecdd 100644
--- a/target/linux/generic/backport-4.19/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch
+++ b/target/linux/generic/backport-4.19/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch
@@ -29,7 +29,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
-@@ -886,8 +886,6 @@ int phy_init_hw(struct phy_device *phyde
+@@ -890,8 +890,6 @@ int phy_init_hw(struct phy_device *phyde
if (phydev->drv->soft_reset)
ret = phydev->drv->soft_reset(phydev);