aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2017-09-20 23:18:24 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2017-09-20 23:50:55 +0300
commit6e48eb22b8d9039b27579283cbe46737a2f4ad80 (patch)
treed0143e45d4a3513d6596f509d5b31a6304e05abb /target/linux/ramips
parent6c32e052188e471fe13d4934df24275b74ad3a60 (diff)
downloadupstream-6e48eb22b8d9039b27579283cbe46737a2f4ad80.tar.gz
upstream-6e48eb22b8d9039b27579283cbe46737a2f4ad80.tar.bz2
upstream-6e48eb22b8d9039b27579283cbe46737a2f4ad80.zip
kernel: update 4.9 to 4.9.51
Refresh patches. Compile-tested on octeon and x86/64. Runtime-tested on octeon and x86/64. Fixes the following CVEs: - CVE-2017-14106 - CVE-2017-14497 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/patches-4.9/0034-NET-multi-phy-support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-4.9/0034-NET-multi-phy-support.patch b/target/linux/ramips/patches-4.9/0034-NET-multi-phy-support.patch
index 9debcc8f3e..c19c3cd35a 100644
--- a/target/linux/ramips/patches-4.9/0034-NET-multi-phy-support.patch
+++ b/target/linux/ramips/patches-4.9/0034-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
-@@ -1035,7 +1035,8 @@ void phy_state_machine(struct work_struc
+@@ -1032,7 +1032,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;
}
-@@ -1127,7 +1128,8 @@ void phy_state_machine(struct work_struc
+@@ -1124,7 +1125,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);
-@@ -1139,7 +1141,8 @@ void phy_state_machine(struct work_struc
+@@ -1136,7 +1138,8 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;