summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2015-06-13 14:50:25 +0200
committerPatrick McHardy <kaber@trash.net>2015-06-13 14:50:25 +0200
commit3ebcddc54c6e3016bc8eb61e4d1ca2f9ca5cd310 (patch)
treec9fb7eca019a313d0825bd52eed17a364e32ec4b
parent077509fdea3aa009823491be7096749c84795874 (diff)
netlink_delinarize: fix merge conflict
Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r--src/netlink_delinearize.c2
1 files changed, 1 insertions, 1 deletions
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);
}