aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.14/300-mvneta-tx-queue-workaround.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-09-20 14:37:43 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-09-21 13:23:16 +0200
commit0dbdb476f3d4b21e6a3b95b596b56bf8f9bae948 (patch)
tree26fcad493231a9cf6363f68a433fef009636519d /target/linux/mvebu/patches-4.14/300-mvneta-tx-queue-workaround.patch
parent72e9b4059eb4ad935d96df7d2a8e73e6c139a8cf (diff)
downloadupstream-0dbdb476f3d4b21e6a3b95b596b56bf8f9bae948.tar.gz
upstream-0dbdb476f3d4b21e6a3b95b596b56bf8f9bae948.tar.bz2
upstream-0dbdb476f3d4b21e6a3b95b596b56bf8f9bae948.zip
kernel: bump 4.14 to 4.14.71
Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.14/300-mvneta-tx-queue-workaround.patch')
-rw-r--r--target/linux/mvebu/patches-4.14/300-mvneta-tx-queue-workaround.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-4.14/300-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-4.14/300-mvneta-tx-queue-workaround.patch
index 7ff586cd15..f21f8083ee 100644
--- a/target/linux/mvebu/patches-4.14/300-mvneta-tx-queue-workaround.patch
+++ b/target/linux/mvebu/patches-4.14/300-mvneta-tx-queue-workaround.patch
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3962,6 +3962,15 @@ static int mvneta_ethtool_set_wol(struct
+@@ -3961,6 +3961,15 @@ static int mvneta_ethtool_set_wol(struct
return ret;
}
@@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static const struct net_device_ops mvneta_netdev_ops = {
.ndo_open = mvneta_open,
.ndo_stop = mvneta_stop,
-@@ -3972,6 +3981,7 @@ static const struct net_device_ops mvnet
+@@ -3971,6 +3980,7 @@ static const struct net_device_ops mvnet
.ndo_fix_features = mvneta_fix_features,
.ndo_get_stats64 = mvneta_get_stats64,
.ndo_do_ioctl = mvneta_ioctl,