From: Patrick McHardy <kaber@trash.net>
Date: Sat, 13 Jun 2015 12:50:25 +0000 (+0200)
Subject: netlink_delinarize: fix merge conflict
X-Git-Tag: v0.5~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ebcddc54c6e3016bc8eb61e4d1ca2f9ca5cd310;p=thirdparty%2Fnftables.git

netlink_delinarize: fix merge conflict

Signed-off-by: Patrick McHardy <kaber@trash.net>
---

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);
 		}