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>
This commit is contained in:
committed by
Stijn Tintel
parent
cae20f64b5
commit
4a1b87aba4
@@ -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;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/ralink/mt7621.c
|
||||
+++ b/arch/mips/ralink/mt7621.c
|
||||
@@ -18,6 +18,7 @@
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <asm/mach-ralink/ralink_regs.h>
|
||||
#include <asm/mach-ralink/mt7621.h>
|
||||
#include <asm/mips-boards/launch.h>
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include <pinmux.h>
|
||||
|
||||
@@ -179,6 +180,58 @@ bool plat_cpu_core_present(int core)
|
||||
@@ -178,6 +179,58 @@ bool plat_cpu_core_present(int core)
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
choice
|
||||
--- a/arch/mips/ralink/timer-gic.c
|
||||
+++ b/arch/mips/ralink/timer-gic.c
|
||||
@@ -12,6 +12,7 @@
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <linux/of.h>
|
||||
#include <linux/clk-provider.h>
|
||||
#include <linux/clocksource.h>
|
||||
@@ -87,7 +87,7 @@
|
||||
|
||||
#include "common.h"
|
||||
|
||||
@@ -19,6 +20,8 @@ void __init plat_time_init(void)
|
||||
@@ -10,6 +11,8 @@ void __init plat_time_init(void)
|
||||
{
|
||||
ralink_of_remap();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user