aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-18 13:00:03 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-18 14:24:57 +0100
commitdd0a213bedd2f751fef1b1b9212192b31b92dee5 (patch)
tree86dfc3b36e61999513aba5d9e7adfbfa4756eba3 /target/linux/layerscape
parent902a9f23d61263e9d9671465b2d24ac6a3962278 (diff)
downloadupstream-dd0a213bedd2f751fef1b1b9212192b31b92dee5.tar.gz
upstream-dd0a213bedd2f751fef1b1b9212192b31b92dee5.tar.bz2
upstream-dd0a213bedd2f751fef1b1b9212192b31b92dee5.zip
kernel: bump 4.9 to 4.9.146
Refreshed all patches. Compile-tested on: brcm2708 Runtime-tested on: brcm2708 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Tested-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch4
-rw-r--r--target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch
index 8a431a02e2..1e33604f6a 100644
--- a/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch
@@ -1370,7 +1370,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
&queue_tx_maxrate.attr,
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
-@@ -3706,7 +3706,7 @@ static int rtnl_get_offload_stats(struct
+@@ -3709,7 +3709,7 @@ static int rtnl_get_offload_stats(struct
if (!size)
continue;
@@ -1379,7 +1379,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
continue;
attr = nla_reserve_64bit(skb, attr_id, size,
-@@ -3747,7 +3747,7 @@ static int rtnl_get_offload_stats_size(c
+@@ -3750,7 +3750,7 @@ static int rtnl_get_offload_stats_size(c
for (attr_id = IFLA_OFFLOAD_XSTATS_FIRST;
attr_id <= IFLA_OFFLOAD_XSTATS_MAX; attr_id++) {
diff --git a/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch b/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch
index 4124bab4ad..9c23279188 100644
--- a/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch
@@ -1713,7 +1713,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
ret = phydrv->resume(phydev);
if (ret)
-@@ -1723,7 +1723,7 @@ static int phy_remove(struct device *dev
+@@ -1720,7 +1720,7 @@ static int phy_remove(struct device *dev
phydev->state = PHY_DOWN;
mutex_unlock(&phydev->lock);