aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-07-16 07:03:17 -0400
committerPetr Štetiar <ynezz@true.cz>2020-07-17 11:00:33 +0200
commitb6443367d8bca111a64f4c111a872fd100cc7d90 (patch)
treeeb1b9ae308c2ed3149f3c76de40e331b4f0774b9 /target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch
parent2a43ab4a18b4dfe2f4e39b28b87c60b01e6dfd5c (diff)
downloadupstream-b6443367d8bca111a64f4c111a872fd100cc7d90.tar.gz
upstream-b6443367d8bca111a64f4c111a872fd100cc7d90.tar.bz2
upstream-b6443367d8bca111a64f4c111a872fd100cc7d90.zip
kernel: bump 5.4 to 5.4.52
update_kernel.sh refreshed all patches, no human interaction was needed Build system: x86_64 Run-tested: Netgear R7800 (ipq806x) Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch')
-rw-r--r--target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch
index ff4be6006c..a82a4c0d62 100644
--- a/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch
+++ b/target/linux/mvebu/patches-5.4/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
-@@ -4652,6 +4652,14 @@ static int mvneta_ethtool_set_eee(struct
+@@ -4684,6 +4684,14 @@ static int mvneta_ethtool_set_eee(struct
return phylink_ethtool_set_eee(pp->phylink, eee);
}
@@ -24,7 +24,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,
-@@ -4662,6 +4670,7 @@ static const struct net_device_ops mvnet
+@@ -4694,6 +4702,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,