]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
netlink_delinarize: fix merge conflict
authorPatrick McHardy <kaber@trash.net>
Sat, 13 Jun 2015 12:50:25 +0000 (14:50 +0200)
committerPatrick McHardy <kaber@trash.net>
Sat, 13 Jun 2015 12:50:25 +0000 (14:50 +0200)
Signed-off-by: Patrick McHardy <kaber@trash.net>
src/netlink_delinearize.c

index 9ee43ba4d8df19bbebbf76b7b571b913e55bdac4..6d60be3214fd2a638cd5bac48f2e07a098bbbf1f 100644 (file)
@@ -1101,7 +1101,7 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp)
                                dtype = concat_subtype_lookup(type, --off);
                                expr_set_type(i, dtype, dtype->byteorder);
                        }
-                       expr_postprocess(ctx, stmt, &i);
+                       expr_postprocess(ctx, &i);
 
                        ntype = concat_subtype_add(ntype, i->dtype->type);
                }