From 3ebcddc54c6e3016bc8eb61e4d1ca2f9ca5cd310 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sat, 13 Jun 2015 14:50:25 +0200 Subject: netlink_delinarize: fix merge conflict Signed-off-by: Patrick McHardy --- src/netlink_delinearize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index 9ee43ba4..6d60be32 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -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); } -- cgit v1.2.3