]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
evaluate: allow implicit ether -> vlan dep
authorFlorian Westphal <fw@strlen.de>
Thu, 11 Aug 2022 07:10:55 +0000 (09:10 +0200)
committerFlorian Westphal <fw@strlen.de>
Wed, 28 Sep 2022 09:52:37 +0000 (11:52 +0200)
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>
src/evaluate.c

index f4b16076fb19466893ee437540448a788501818b..ca6e5883a1f984005dda438b40c53ca6234fe72a 100644 (file)
@@ -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;