aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.19/300-mvneta-tx-queue-workaround.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-02-21 15:09:00 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-02-24 14:19:16 +0100
commitb6c9d2bab09068776b146962e23f1ce7f5f75f07 (patch)
tree9d981bdf6d64bc9ca509b5ab262ef93b23d762c1 /target/linux/mvebu/patches-4.19/300-mvneta-tx-queue-workaround.patch
parentf4bea1b6a378fef02001cb86eebe2e51fe1c5427 (diff)
downloadupstream-b6c9d2bab09068776b146962e23f1ce7f5f75f07.tar.gz
upstream-b6c9d2bab09068776b146962e23f1ce7f5f75f07.tar.bz2
upstream-b6c9d2bab09068776b146962e23f1ce7f5f75f07.zip
kernel: bump 4.19 to 4.19.105
Refreshed all patches. Fixes: - CVE-2013-1798 - CVE-2019-3016 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.19/300-mvneta-tx-queue-workaround.patch')
-rw-r--r--target/linux/mvebu/patches-4.19/300-mvneta-tx-queue-workaround.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-4.19/300-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-4.19/300-mvneta-tx-queue-workaround.patch
index c27b5d9478..4a5ea36144 100644
--- a/target/linux/mvebu/patches-4.19/300-mvneta-tx-queue-workaround.patch
+++ b/target/linux/mvebu/patches-4.19/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
-@@ -4257,6 +4257,15 @@ static int mvneta_ethtool_set_eee(struct
+@@ -4272,6 +4272,15 @@ static int mvneta_ethtool_set_eee(struct
return phylink_ethtool_set_eee(pp->phylink, eee);
}
@@ -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,
-@@ -4267,6 +4276,7 @@ static const struct net_device_ops mvnet
+@@ -4282,6 +4291,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,