mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
From 79572c98c554dcdb080bca547c871a51716dcdf8 Mon Sep 17 00:00:00 2001
|
|
From: Sven Auhagen <sven.auhagen@voleatech.de>
|
|
Date: Sat, 25 Jan 2020 08:07:03 +0000
|
|
Subject: [PATCH] mvneta driver disallow XDP program on hardware buffer
|
|
management
|
|
|
|
Recently XDP Support was added to the mvneta driver
|
|
for software buffer management only.
|
|
It is still possible to attach an XDP program if
|
|
hardware buffer management is used.
|
|
It is not doing anything at that point.
|
|
|
|
The patch disallows attaching XDP programs to mvneta
|
|
if hardware buffer management is used.
|
|
|
|
I am sorry about that. It is my first submission and I am having
|
|
some troubles with the format of my emails.
|
|
|
|
v4 -> v5:
|
|
- Remove extra tabs
|
|
|
|
v3 -> v4:
|
|
- Please ignore v3 I accidentally submitted
|
|
my other patch with git-send-mail and v4 is correct
|
|
|
|
v2 -> v3:
|
|
- My mailserver corrupted the patch
|
|
resubmission with git-send-email
|
|
|
|
v1 -> v2:
|
|
- Fixing the patches indentation
|
|
|
|
Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/marvell/mvneta.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
|
@@ -4270,6 +4270,12 @@ static int mvneta_xdp_setup(struct net_d
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
+ if (pp->bm_priv) {
|
|
+ NL_SET_ERR_MSG_MOD(extack,
|
|
+ "Hardware Buffer Management not supported on XDP");
|
|
+ return -EOPNOTSUPP;
|
|
+ }
|
|
+
|
|
need_update = !!pp->xdp_prog != !!prog;
|
|
if (running && need_update)
|
|
mvneta_stop(dev);
|