aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-4.4/830-huawei_e970_support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-08-15 18:53:23 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-08-15 19:18:47 +0200
commitf3865bd4efa8c0fbf82899d0c3072a192f3beaea (patch)
tree0767cde9a67454fcc07ca3fb21bf40234e451317 /target/linux/brcm47xx/patches-4.4/830-huawei_e970_support.patch
parent5886a5060a4cd17e87a60028d878525150075653 (diff)
downloadupstream-f3865bd4efa8c0fbf82899d0c3072a192f3beaea.tar.gz
upstream-f3865bd4efa8c0fbf82899d0c3072a192f3beaea.tar.bz2
upstream-f3865bd4efa8c0fbf82899d0c3072a192f3beaea.zip
kernel: bump kernel 4.4 to version 4.4.148
The following patch was integrated upstream: * target/linux/generic/patches-4.4/005-ext4-fix-check-to-prevent-initializing-reserved-inod.patch This fixes tries to work around the following security problems: * CVE-2018-3620 L1 Terminal Fault OS, SMM related aspects * CVE-2018-3646 L1 Terminal Fault Virtualization related aspects Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm47xx/patches-4.4/830-huawei_e970_support.patch')
-rw-r--r--target/linux/brcm47xx/patches-4.4/830-huawei_e970_support.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-4.4/830-huawei_e970_support.patch b/target/linux/brcm47xx/patches-4.4/830-huawei_e970_support.patch
index 5b360133f2..f67c5dde1c 100644
--- a/target/linux/brcm47xx/patches-4.4/830-huawei_e970_support.patch
+++ b/target/linux/brcm47xx/patches-4.4/830-huawei_e970_support.patch
@@ -8,7 +8,7 @@
#include <asm/bootinfo.h>
#include <asm/idle.h>
#include <asm/prom.h>
-@@ -268,6 +269,33 @@ static struct fixed_phy_status bcm47xx_f
+@@ -262,6 +263,33 @@ static struct fixed_phy_status bcm47xx_f
.duplex = DUPLEX_FULL,
};
@@ -42,7 +42,7 @@
static int __init bcm47xx_register_bus_complete(void)
{
switch (bcm47xx_bus_type) {
-@@ -287,6 +315,7 @@ static int __init bcm47xx_register_bus_c
+@@ -281,6 +309,7 @@ static int __init bcm47xx_register_bus_c
bcm47xx_workarounds();
fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status, -1);