aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.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/006-net-mvneta-add-basic-XDP-support.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/006-net-mvneta-add-basic-XDP-support.patch')
-rw-r--r--target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.patch b/target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.patch
index 163632df51..4e42bf9307 100644
--- a/target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.patch
+++ b/target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.patch
@@ -232,7 +232,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
};
int err;
-@@ -3364,6 +3447,11 @@ static int mvneta_change_mtu(struct net_
+@@ -3366,6 +3449,11 @@ static int mvneta_change_mtu(struct net_
mtu = ALIGN(MVNETA_RX_PKT_SIZE(mtu), 8);
}
@@ -244,7 +244,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
dev->mtu = mtu;
if (!netif_running(dev)) {
-@@ -4029,6 +4117,47 @@ static int mvneta_ioctl(struct net_devic
+@@ -4036,6 +4124,47 @@ static int mvneta_ioctl(struct net_devic
return phylink_mii_ioctl(pp->phylink, ifr, cmd);
}
@@ -292,7 +292,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Ethtool methods */
/* Set link ksettings (phy address, speed) for ethtools */
-@@ -4425,6 +4554,7 @@ static const struct net_device_ops mvnet
+@@ -4432,6 +4561,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,
@@ -300,7 +300,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
};
static const struct ethtool_ops mvneta_eth_tool_ops = {
-@@ -4713,7 +4843,7 @@ static int mvneta_probe(struct platform_
+@@ -4720,7 +4850,7 @@ static int mvneta_probe(struct platform_
SET_NETDEV_DEV(dev, &pdev->dev);
pp->id = global_port_id++;