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>2021-03-05 09:22:20 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2021-03-10 13:55:56 +0100
commit55e9d87754ee79c29e53868d01bd6974d16365c5 (patch)
tree6567b003f06f9c959b4e97201242623dd19de9cd /target/linux/mvebu/patches-4.14/300-mvneta-tx-queue-workaround.patch
parentc64742a96ea2f673cae1f33222368a11696b6a3d (diff)
downloadupstream-55e9d87754ee79c29e53868d01bd6974d16365c5.tar.gz
upstream-55e9d87754ee79c29e53868d01bd6974d16365c5.tar.bz2
upstream-55e9d87754ee79c29e53868d01bd6974d16365c5.zip
kernel: bump 4.14 to 4.14.223
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, 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 6c21fa30be..46ffe12401 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
-@@ -3960,6 +3960,15 @@ static int mvneta_ethtool_set_wol(struct
+@@ -3967,6 +3967,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,
-@@ -3970,6 +3979,7 @@ static const struct net_device_ops mvnet
+@@ -3977,6 +3986,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,