35 lines
1.0 KiB
Diff
35 lines
1.0 KiB
Diff
From c3afb1d8865a724c03ea1008c82ad18a781ed043 Mon Sep 17 00:00:00 2001
|
|
From: Florian Westphal <fw@strlen.de>
|
|
Date: Thu, 11 Aug 2022 09:10:55 +0200
|
|
Subject: [PATCH] evaluate: allow implicit ether -> vlan dep
|
|
|
|
nft add rule inet filter input vlan id 2
|
|
Error: conflicting protocols specified: ether vs. vlan
|
|
|
|
Refresh the current dependency after superseding the dummy
|
|
dependency to make this work.
|
|
|
|
Conflict: The content of the patch has not been changed, the patch context does not match, it is suitable for the patch
|
|
Reference: https://git.netfilter.org/nftables/commit?id=c3afb1d8865a724c03ea1008c82ad18a781ed043
|
|
|
|
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
---
|
|
src/evaluate.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/evaluate.c b/src/evaluate.c
|
|
index e6bb07a..76867a7 100644
|
|
--- a/src/evaluate.c
|
|
+++ b/src/evaluate.c
|
|
@@ -654,6 +654,7 @@ static int resolve_protocol_conflict(struct eval_ctx *ctx,
|
|
if (err < 0)
|
|
return err;
|
|
|
|
+ desc = payload->payload.desc;
|
|
rule_stmt_insert_at(ctx->rule, nstmt, ctx->stmt);
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|