From acdd360a65bb64104e876c92a33daab9c05a51de Mon Sep 17 00:00:00 2001 From: Laura Garcia Liebana Date: Mon, 21 Jan 2019 12:37:34 +0100 Subject: Revert "expr: add map lookups for numgen statements" A better way to implement this from userspace has been found without specific code in the kernel side, revert this. Fixes: b97f45c2ebaa ("expr: add map lookups for numgen statements") Signed-off-by: Laura Garcia Liebana Signed-off-by: Pablo Neira Ayuso --- include/libnftnl/expr.h | 4 ++-- include/linux/netfilter/nf_tables.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h index cb1b54b..7d128fe 100644 --- a/include/libnftnl/expr.h +++ b/include/libnftnl/expr.h @@ -55,8 +55,8 @@ enum { NFTNL_EXPR_NG_MODULUS, NFTNL_EXPR_NG_TYPE, NFTNL_EXPR_NG_OFFSET, - NFTNL_EXPR_NG_SET_NAME, - NFTNL_EXPR_NG_SET_ID, + NFTNL_EXPR_NG_SET_NAME, /* deprecated */ + NFTNL_EXPR_NG_SET_ID, /* deprecated */ }; enum { diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index 40c71c9..9075cbf 100644 --- a/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h @@ -1611,8 +1611,8 @@ enum nft_ng_attributes { NFTA_NG_MODULUS, NFTA_NG_TYPE, NFTA_NG_OFFSET, - NFTA_NG_SET_NAME, - NFTA_NG_SET_ID, + NFTA_NG_SET_NAME, /* deprecated */ + NFTA_NG_SET_ID, /* deprecated */ __NFTA_NG_MAX }; #define NFTA_NG_MAX (__NFTA_NG_MAX - 1) -- cgit v1.2.3