From: Florian Westphal <fw@strlen.de>
Date: Thu, 11 Aug 2022 07:10:55 +0000 (+0200)
Subject: evaluate: allow implicit ether -> vlan dep
X-Git-Tag: v1.0.6~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3afb1d8865a724c03ea1008c82ad18a781ed043;p=thirdparty%2Fnftables.git

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.

Signed-off-by: Florian Westphal <fw@strlen.de>
---

diff --git a/src/evaluate.c b/src/evaluate.c
index f4b16076..ca6e5883 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -665,6 +665,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);
 		} else {
 			unsigned int i;