aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.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/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.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/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch')
-rw-r--r--target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch b/target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch
index a4ee285b04..6e79aeb358 100644
--- a/target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch
+++ b/target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -2108,7 +2108,8 @@ mvneta_run_xdp(struct mvneta_port *pp, s
+@@ -2110,7 +2110,8 @@ mvneta_run_xdp(struct mvneta_port *pp, s
err = xdp_do_redirect(pp->dev, xdp, prog);
if (err) {
ret = MVNETA_XDP_DROPPED;
@@ -27,7 +27,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
} else {
ret = MVNETA_XDP_REDIR;
}
-@@ -2117,7 +2118,8 @@ mvneta_run_xdp(struct mvneta_port *pp, s
+@@ -2119,7 +2120,8 @@ mvneta_run_xdp(struct mvneta_port *pp, s
case XDP_TX:
ret = mvneta_xdp_xmit_back(pp, xdp);
if (ret != MVNETA_XDP_TX)