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>2020-04-15 14:55:36 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-04-16 13:23:52 +0200
commit0232f57e1af6580542c0ed1ce1d76c7cd4084613 (patch)
treee7e624d4c97826e318676c53e114e1a2405c6a2e /target/linux/mvebu/patches-4.14/300-mvneta-tx-queue-workaround.patch
parent286c407c3d8877e51fa90cbd830f2fedb3ad1f26 (diff)
downloadupstream-0232f57e1af6580542c0ed1ce1d76c7cd4084613.tar.gz
upstream-0232f57e1af6580542c0ed1ce1d76c7cd4084613.tar.bz2
upstream-0232f57e1af6580542c0ed1ce1d76c7cd4084613.zip
kernel: bump 4.14 to 4.14.176
Refreshed all patches. Remove upstreamed: - 0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch - 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch - 003-ARM-dts-oxnas-Fix-clear-mask-property.patch Fixes: - CVE-2020-8647 - CVE-2020-8648 (potentially) - CVE-2020-8649 Compile-tested on: cns3xxx, octeontx Runtime-tested on: cns3xxx 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 f21f8083ee..6c21fa30be 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
-@@ -3961,6 +3961,15 @@ static int mvneta_ethtool_set_wol(struct
+@@ -3960,6 +3960,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,
-@@ -3971,6 +3980,7 @@ static const struct net_device_ops mvnet
+@@ -3970,6 +3979,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,