From ef687ba53271afe01bfe9d66cfe0b3cc7a8b5b56 Mon Sep 17 00:00:00 2001 From: Liping Zhang Date: Mon, 12 Sep 2016 20:19:04 +0800 Subject: src: fix compile error due to _UNTIL renamed to _MODULUS in libnftnl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the latest libnftnl, NFTNL_EXPR_NG_UNTIL was renamed to NFTNL_EXPR_NG_MODULUS, so compile error happened: netlink_linearize.c: In function ‘netlink_gen_numgen’: netlink_linearize.c:184:26: error: ‘NFTNL_EXPR_NG_UNTIL’ undeclared (first use in this function) Also update NFTA_NG_UNTIL to NFTA_NG_MODULUS. Signed-off-by: Liping Zhang Signed-off-by: Pablo Neira Ayuso --- include/linux/netfilter/nf_tables.h | 4 ++-- src/netlink_delinearize.c | 2 +- src/netlink_linearize.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index 8a63f22b..1bec149b 100644 --- a/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h @@ -1126,13 +1126,13 @@ enum nft_trace_types { * enum nft_ng_attributes - nf_tables number generator expression netlink attributes * * @NFTA_NG_DREG: destination register (NLA_U32) - * @NFTA_NG_UNTIL: source value to increment the counter until reset (NLA_U32) + * @NFTA_NG_MODULUS: maximum counter value (NLA_U32) * @NFTA_NG_TYPE: operation type (NLA_U32) */ enum nft_ng_attributes { NFTA_NG_UNSPEC, NFTA_NG_DREG, - NFTA_NG_UNTIL, + NFTA_NG_MODULUS, NFTA_NG_TYPE, __NFTA_NG_MAX }; diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index 05edb015..6bb27b6f 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -554,7 +554,7 @@ static void netlink_parse_numgen(struct netlink_parse_ctx *ctx, struct expr *expr; type = nftnl_expr_get_u32(nle, NFTNL_EXPR_NG_TYPE); - until = nftnl_expr_get_u32(nle, NFTNL_EXPR_NG_UNTIL); + until = nftnl_expr_get_u32(nle, NFTNL_EXPR_NG_MODULUS); expr = numgen_expr_alloc(loc, type, until); dreg = netlink_parse_register(nle, NFTNL_EXPR_NG_DREG); diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c index 5204154a..558deb23 100644 --- a/src/netlink_linearize.c +++ b/src/netlink_linearize.c @@ -181,7 +181,7 @@ static void netlink_gen_numgen(struct netlink_linearize_ctx *ctx, nle = alloc_nft_expr("numgen"); netlink_put_register(nle, NFTNL_EXPR_NG_DREG, dreg); netlink_put_register(nle, NFTNL_EXPR_NG_TYPE, expr->numgen.type); - nftnl_expr_set_u32(nle, NFTNL_EXPR_NG_UNTIL, expr->numgen.mod); + nftnl_expr_set_u32(nle, NFTNL_EXPR_NG_MODULUS, expr->numgen.mod); nftnl_rule_add_expr(ctx->nlr, nle); } -- cgit v1.2.3