From eccdc43528891d9b1298a602a8e960b0808efd14 Mon Sep 17 00:00:00 2001 From: Laura Garcia Liebana Date: Wed, 7 Sep 2016 14:29:45 +0200 Subject: expr: numgen: Rename until attribute by modulus The _modulus_ attribute will be reused as _until_, as it's similar to other expressions with value limits (ex. hash). Renaming is possible according to the kernel module ntf_numgen that has not been released yet. Signed-off-by: Laura Garcia Liebana Signed-off-by: Pablo Neira Ayuso --- include/buffer.h | 1 - include/libnftnl/expr.h | 2 +- include/linux/netfilter/nf_tables.h | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/buffer.h b/include/buffer.h index 8cfe377..a753c78 100644 --- a/include/buffer.h +++ b/include/buffer.h @@ -82,7 +82,6 @@ int nftnl_buf_reg(struct nftnl_buf *b, int type, union nftnl_data_reg *reg, #define TOTAL "total" #define TYPE "type" #define UNIT "unit" -#define UNTIL "until" #define USE "use" #define XOR "xor" #define ADD "add" diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h index 8815154..94ce529 100644 --- a/include/libnftnl/expr.h +++ b/include/libnftnl/expr.h @@ -52,7 +52,7 @@ enum { enum { NFTNL_EXPR_NG_DREG = NFTNL_EXPR_BASE, - NFTNL_EXPR_NG_UNTIL, + NFTNL_EXPR_NG_MODULUS, NFTNL_EXPR_NG_TYPE, }; diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index 8a63f22..dd8b746 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 value to be returned (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 }; -- cgit v1.2.3