From: Felix Fietkau <nbd@nbd.name>
To: netdev@vger.kernel.org
Cc: pablo@netfilter.org, netfilter-devel@vger.kernel.org
Subject: [PATCH v2 nf 4/4] netfilter: nft_flow_offload: fix offload with pppoe + vlan
Date: Mon, 9 May 2022 14:26:16 +0200 [thread overview]
Message-ID: <20220509122616.65449-4-nbd@nbd.name> (raw)
In-Reply-To: <20220509122616.65449-1-nbd@nbd.name>
When running a combination of PPPoE on top of a VLAN, we need to set
info->outdev to the PPPoE device, otherwise PPPoE encap is skipped
during software offload.
Fixes: 72efd585f714 ("netfilter: flowtable: add pppoe support")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
net/netfilter/nft_flow_offload.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c
index d88de26aad75..187b8cb9a510 100644
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
@@ -123,7 +123,8 @@ static void nft_dev_path_info(const struct net_device_path_stack *stack,
info->indev = NULL;
break;
}
- info->outdev = path->dev;
+ if (!info->outdev)
+ info->outdev = path->dev;
info->encap[info->num_encaps].id = path->encap.id;
info->encap[info->num_encaps].proto = path->encap.proto;
info->num_encaps++;
--
2.35.1
next prev parent reply other threads:[~2022-05-09 12:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 12:26 [PATCH v2 nf 1/4] netfilter: flowtable: fix excessive hw offload attempts after failure Felix Fietkau
2022-05-09 12:26 ` [PATCH v2 nf 2/4] netfilter: nft_flow_offload: skip dst neigh lookup for ppp devices Felix Fietkau
2022-05-09 12:26 ` [PATCH v2 nf 3/4] net: fix dev_fill_forward_path with pppoe + bridge Felix Fietkau
2022-05-09 12:26 ` Felix Fietkau [this message]
2022-05-16 10:59 ` [PATCH v2 nf 1/4] netfilter: flowtable: fix excessive hw offload attempts after failure Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220509122616.65449-4-nbd@nbd.name \
--to=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).