aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2017-10-22 14:00:42 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2017-10-23 17:23:34 +0300
commit834810617edba87e43f7b58fa32800155eea9aef (patch)
tree5ad1ee7823c6b604ce6393b573b49ae6bf7f928d /target/linux/layerscape
parent683350873e18f592124cb2cce771d5459d27b2bd (diff)
downloadupstream-834810617edba87e43f7b58fa32800155eea9aef.tar.gz
upstream-834810617edba87e43f7b58fa32800155eea9aef.tar.bz2
upstream-834810617edba87e43f7b58fa32800155eea9aef.zip
kernel: bump 4.9 to 4.9.58
Refresh patches. Compile-tested: ar71xx, octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/patches-4.9/601-net-support-layerscape.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-4.9/601-net-support-layerscape.patch b/target/linux/layerscape/patches-4.9/601-net-support-layerscape.patch
index 7f94776745..9db40dc2ff 100644
--- a/target/linux/layerscape/patches-4.9/601-net-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/601-net-support-layerscape.patch
@@ -962,7 +962,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
/* Rx descriptors helper methods */
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
-@@ -5762,7 +5762,7 @@ error:
+@@ -5761,7 +5761,7 @@ error:
return err;
}
@@ -971,7 +971,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
mvpp2_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
{
struct mvpp2_port *port = netdev_priv(dev);
-@@ -5794,8 +5794,6 @@ mvpp2_get_stats64(struct net_device *dev
+@@ -5793,8 +5793,6 @@ mvpp2_get_stats64(struct net_device *dev
stats->rx_errors = dev->stats.rx_errors;
stats->rx_dropped = dev->stats.rx_dropped;
stats->tx_dropped = dev->stats.tx_dropped;