aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm47xx
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-02-21 15:04:52 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-02-24 14:18:59 +0100
commitf4bea1b6a378fef02001cb86eebe2e51fe1c5427 (patch)
treeb533101ecb38aab9a2f34074627f64788191c834 /target/linux/bcm47xx
parent7e9c7e7b2d4c36734912074aa1c19acea8f3801a (diff)
downloadupstream-f4bea1b6a378fef02001cb86eebe2e51fe1c5427.tar.gz
upstream-f4bea1b6a378fef02001cb86eebe2e51fe1c5427.tar.bz2
upstream-f4bea1b6a378fef02001cb86eebe2e51fe1c5427.zip
kernel: bump 4.14 to 4.14.171
Refreshed all patches. Fixes: - CVE-2013-1798 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/bcm47xx')
-rw-r--r--target/linux/bcm47xx/patches-4.14/209-b44-register-adm-switch.patch6
-rw-r--r--target/linux/bcm47xx/patches-4.14/210-b44_phy_fix.patch2
-rw-r--r--target/linux/bcm47xx/patches-4.14/831-old_gpio_wdt.patch2
3 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/bcm47xx/patches-4.14/209-b44-register-adm-switch.patch b/target/linux/bcm47xx/patches-4.14/209-b44-register-adm-switch.patch
index 6e655ac802..cdeb1f96e9 100644
--- a/target/linux/bcm47xx/patches-4.14/209-b44-register-adm-switch.patch
+++ b/target/linux/bcm47xx/patches-4.14/209-b44-register-adm-switch.patch
@@ -19,7 +19,7 @@ Subject: [PATCH 210/210] b44: register adm switch
#include <linux/uaccess.h>
#include <asm/io.h>
-@@ -2248,6 +2250,69 @@ static void b44_adjust_link(struct net_d
+@@ -2251,6 +2253,69 @@ static void b44_adjust_link(struct net_d
}
}
@@ -89,7 +89,7 @@ Subject: [PATCH 210/210] b44: register adm switch
static int b44_register_phy_one(struct b44 *bp)
{
struct mii_bus *mii_bus;
-@@ -2283,6 +2348,9 @@ static int b44_register_phy_one(struct b
+@@ -2286,6 +2351,9 @@ static int b44_register_phy_one(struct b
if (!mdiobus_is_registered_device(bp->mii_bus, bp->phy_addr) &&
(sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) {
@@ -99,7 +99,7 @@ Subject: [PATCH 210/210] b44: register adm switch
dev_info(sdev->dev,
"could not find PHY at %i, use fixed one\n",
bp->phy_addr);
-@@ -2477,6 +2545,7 @@ static void b44_remove_one(struct ssb_de
+@@ -2480,6 +2548,7 @@ static void b44_remove_one(struct ssb_de
unregister_netdev(dev);
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
b44_unregister_phy_one(bp);
diff --git a/target/linux/bcm47xx/patches-4.14/210-b44_phy_fix.patch b/target/linux/bcm47xx/patches-4.14/210-b44_phy_fix.patch
index 5620d5cd5f..bff6052108 100644
--- a/target/linux/bcm47xx/patches-4.14/210-b44_phy_fix.patch
+++ b/target/linux/bcm47xx/patches-4.14/210-b44_phy_fix.patch
@@ -43,7 +43,7 @@
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
return 0;
-@@ -2178,6 +2203,8 @@ static int b44_get_invariants(struct b44
+@@ -2181,6 +2206,8 @@ static int b44_get_invariants(struct b44
* valid PHY address. */
bp->phy_addr &= 0x1F;
diff --git a/target/linux/bcm47xx/patches-4.14/831-old_gpio_wdt.patch b/target/linux/bcm47xx/patches-4.14/831-old_gpio_wdt.patch
index c2becac712..42478d475a 100644
--- a/target/linux/bcm47xx/patches-4.14/831-old_gpio_wdt.patch
+++ b/target/linux/bcm47xx/patches-4.14/831-old_gpio_wdt.patch
@@ -4,7 +4,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -1472,6 +1472,15 @@ config WDT_MTX1
+@@ -1473,6 +1473,15 @@ config WDT_MTX1
Hardware driver for the MTX-1 boards. This is a watchdog timer that
will reboot the machine after a 100 seconds timer expired.