mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-05-30 03:16:13 +02:00
13cdc8955c
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.80 Manually rebased: generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch[1] All other patches automatically rebased. 1. Acknowledgement to @heheb and @DragonBluep. Upstream commit for ref: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.80&id=9c5662e95a8dcc232c3ef4deb21033badcd260f6 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Thu, 31 Aug 2023 21:48:38 +0200
|
|
Subject: [PATCH] netfilter: nf_tables: ignore -EOPNOTSUPP on flowtable device
|
|
offload setup
|
|
|
|
On many embedded devices, it is common to configure flowtable offloading for
|
|
a mix of different devices, some of which have hardware offload support and
|
|
some of which don't.
|
|
The current code limits the ability of user space to properly set up such a
|
|
configuration by only allowing adding devices with hardware offload support to
|
|
a offload-enabled flowtable.
|
|
Given that offload-enabled flowtables also imply fallback to pure software
|
|
offloading, this limitation makes little sense.
|
|
Fix it by not bailing out when the offload setup returns -EOPNOTSUPP
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/net/netfilter/nf_tables_api.c
|
|
+++ b/net/netfilter/nf_tables_api.c
|
|
@@ -7911,7 +7911,7 @@ static int nft_register_flowtable_net_ho
|
|
err = flowtable->data.type->setup(&flowtable->data,
|
|
hook->ops.dev,
|
|
FLOW_BLOCK_BIND);
|
|
- if (err < 0)
|
|
+ if (err < 0 && err != -EOPNOTSUPP)
|
|
goto err_unregister_net_hooks;
|
|
|
|
err = nf_register_net_hook(net, &hook->ops);
|