aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-4.4/0026-NET-multi-phy-support.patch
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>2017-08-17 13:21:21 +0100
committerStijn Tintel <stijn@linux-ipv6.be>2017-08-17 14:31:45 +0200
commit364befeccf01c07049b492d90e98c2c13457c7c3 (patch)
tree911e05589cbc75031713804d0d0767d95a075a05 /target/linux/lantiq/patches-4.4/0026-NET-multi-phy-support.patch
parent2d02a4f5bda4a5ff392286360ec7d1129bd77d25 (diff)
downloadupstream-364befeccf01c07049b492d90e98c2c13457c7c3.tar.gz
upstream-364befeccf01c07049b492d90e98c2c13457c7c3.tar.bz2
upstream-364befeccf01c07049b492d90e98c2c13457c7c3.zip
kernel: update 4.4 to 4.4.83
Refresh patches. Minor update 704-phy-no-genphy-soft-reset.patch which was partially accepted upstream. Compile-tested on ar71xx. Runtime-tested on ar71xx. Fixes the following vulnerabilities: - CVE-2017-7533 (4.4.80) - CVE-2017-1000111 (4.4.82) - CVE-2017-1000112 (4.4.82) Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> [cleanup commit message, add compile/runtime tested] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/lantiq/patches-4.4/0026-NET-multi-phy-support.patch')
-rw-r--r--target/linux/lantiq/patches-4.4/0026-NET-multi-phy-support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-4.4/0026-NET-multi-phy-support.patch b/target/linux/lantiq/patches-4.4/0026-NET-multi-phy-support.patch
index 381170a396..f52f6f544b 100644
--- a/target/linux/lantiq/patches-4.4/0026-NET-multi-phy-support.patch
+++ b/target/linux/lantiq/patches-4.4/0026-NET-multi-phy-support.patch
@@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -890,7 +890,8 @@ void phy_state_machine(struct work_struc
+@@ -893,7 +893,8 @@ void phy_state_machine(struct work_struc
/* If the link is down, give up on negotiation for now */
if (!phydev->link) {
phydev->state = PHY_NOLINK;
@@ -21,7 +21,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
phydev->adjust_link(phydev->attached_dev);
break;
}
-@@ -973,7 +974,8 @@ void phy_state_machine(struct work_struc
+@@ -985,7 +986,8 @@ void phy_state_machine(struct work_struc
netif_carrier_on(phydev->attached_dev);
} else {
phydev->state = PHY_NOLINK;
@@ -31,7 +31,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
}
phydev->adjust_link(phydev->attached_dev);
-@@ -985,7 +987,8 @@ void phy_state_machine(struct work_struc
+@@ -997,7 +999,8 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;