aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4/700-mvneta-tx-queue-workaround.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-03-06 00:31:31 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2021-03-06 15:51:54 +0100
commit8b3d879861086fbb965f5bdb95e1286ec049c290 (patch)
tree26cf73971458b55c9d7d0a9f377d1a96aa69074b /target/linux/mvebu/patches-5.4/700-mvneta-tx-queue-workaround.patch
parent7e1ab3b7462b11885a5b9a48804463dba465fe9a (diff)
downloadupstream-8b3d879861086fbb965f5bdb95e1286ec049c290.tar.gz
upstream-8b3d879861086fbb965f5bdb95e1286ec049c290.tar.bz2
upstream-8b3d879861086fbb965f5bdb95e1286ec049c290.zip
kernel: bump 5.4 to 5.4.102
Refreshed all patches. Compile-tested on: ath79, lantiq, ipq40xx, x86_64 Runtime-tested on: ipq40xx, x86_64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mvebu/patches-5.4/700-mvneta-tx-queue-workaround.patch')
-rw-r--r--target/linux/mvebu/patches-5.4/700-mvneta-tx-queue-workaround.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-5.4/700-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-5.4/700-mvneta-tx-queue-workaround.patch
index a82a4c0d62..a83d891ff8 100644
--- a/target/linux/mvebu/patches-5.4/700-mvneta-tx-queue-workaround.patch
+++ b/target/linux/mvebu/patches-5.4/700-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
-@@ -4684,6 +4684,14 @@ static int mvneta_ethtool_set_eee(struct
+@@ -4691,6 +4691,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,
-@@ -4694,6 +4702,7 @@ static const struct net_device_ops mvnet
+@@ -4701,6 +4709,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,