aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-01-24 11:13:35 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-01-24 13:14:33 +0100
commit76254cb75e4abc2a87e13134915cd0c422926fde (patch)
treec5a254d2dd51f56d75bc5413e709c43d77220bf4 /target/linux/ar71xx/patches-4.14
parent7a57e82f28a262b319ee2e1792d917778c95fe93 (diff)
downloadupstream-76254cb75e4abc2a87e13134915cd0c422926fde.tar.gz
upstream-76254cb75e4abc2a87e13134915cd0c422926fde.tar.bz2
upstream-76254cb75e4abc2a87e13134915cd0c422926fde.zip
kernel: bump 4.14 to 4.14.167
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ar71xx/patches-4.14')
-rw-r--r--target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch2
-rw-r--r--target/linux/ar71xx/patches-4.14/903-at803x-add-sgmii-aneg-override-pdata.patch4
-rw-r--r--target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch b/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch
index 81de68c9cb..e4e51963bb 100644
--- a/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch
+++ b/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch
@@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
if (IS_ERR(gpiod_reset))
return PTR_ERR(gpiod_reset);
-@@ -411,15 +418,23 @@ static void at803x_link_change_notify(st
+@@ -402,15 +409,23 @@ static void at803x_link_change_notify(st
* cannot recover from by software.
*/
if (phydev->state == PHY_NOLINK) {
diff --git a/target/linux/ar71xx/patches-4.14/903-at803x-add-sgmii-aneg-override-pdata.patch b/target/linux/ar71xx/patches-4.14/903-at803x-add-sgmii-aneg-override-pdata.patch
index 8948fd4954..600f8ff6de 100644
--- a/target/linux/ar71xx/patches-4.14/903-at803x-add-sgmii-aneg-override-pdata.patch
+++ b/target/linux/ar71xx/patches-4.14/903-at803x-add-sgmii-aneg-override-pdata.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
-@@ -478,12 +478,15 @@ static void at803x_link_change_notify(st
+@@ -458,12 +458,15 @@ static void at803x_link_change_notify(st
static int at803x_aneg_done(struct phy_device *phydev)
{
@@ -16,7 +16,7 @@
/*
* in SGMII mode, if copper side autoneg is successful,
* also check SGMII side autoneg result
-@@ -498,7 +501,8 @@ static int at803x_aneg_done(struct phy_d
+@@ -478,7 +481,8 @@ static int at803x_aneg_done(struct phy_d
/* check if the SGMII link is OK. */
if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
pr_warn("803x_aneg_done: SGMII link is not ok\n");
diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
index d1dd056f76..f2732ebb20 100644
--- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
@@ -757,7 +757,7 @@
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -3877,14 +3877,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3878,14 +3878,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);