aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-02-04 10:41:29 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-02-04 18:12:19 +0100
commitc23607185963f5ba31760cbe118cf54af91cc0ec (patch)
tree23c94fb9f41cee86e7050f3e63dcff9bc934bd96 /target/linux/lantiq
parent6bfde6758188fe4a19f506edfc21ece15c4a8c77 (diff)
downloadupstream-c23607185963f5ba31760cbe118cf54af91cc0ec.tar.gz
upstream-c23607185963f5ba31760cbe118cf54af91cc0ec.tar.bz2
upstream-c23607185963f5ba31760cbe118cf54af91cc0ec.zip
kernel: bump 4.9 to 4.9.212
Refreshed all patches. Fixes: - CVE-2019-14896 - CVE-2019-14897 Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/patches-4.9/0026-NET-multi-phy-support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-4.9/0026-NET-multi-phy-support.patch b/target/linux/lantiq/patches-4.9/0026-NET-multi-phy-support.patch
index eb6acdb2f7..e5cfc0a7d3 100644
--- a/target/linux/lantiq/patches-4.9/0026-NET-multi-phy-support.patch
+++ b/target/linux/lantiq/patches-4.9/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
-@@ -1038,7 +1038,8 @@ void phy_state_machine(struct work_struc
+@@ -1039,7 +1039,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;
}
-@@ -1130,7 +1131,8 @@ void phy_state_machine(struct work_struc
+@@ -1131,7 +1132,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);
-@@ -1142,7 +1144,8 @@ void phy_state_machine(struct work_struc
+@@ -1143,7 +1145,8 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;