From: Stefano Brivio Date: Mon, 13 Apr 2020 19:48:02 +0000 (+0200) Subject: include: Resync nf_tables.h cache copy X-Git-Tag: v0.9.5~52 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1e5a0499c0773f18bc592dd0da0340120daa482;p=thirdparty%2Fnftables.git include: Resync nf_tables.h cache copy Get this header in sync with nf.git as of commit ef516e8625dd. Signed-off-by: Stefano Brivio Signed-off-by: Pablo Neira Ayuso --- diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index 30f2a872..4565456c 100644 --- a/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h @@ -276,6 +276,7 @@ enum nft_rule_compat_attributes { * @NFT_SET_TIMEOUT: set uses timeouts * @NFT_SET_EVAL: set can be updated from the evaluation path * @NFT_SET_OBJECT: set contains stateful objects + * @NFT_SET_CONCAT: set contains a concatenation */ enum nft_set_flags { NFT_SET_ANONYMOUS = 0x1, @@ -285,6 +286,7 @@ enum nft_set_flags { NFT_SET_TIMEOUT = 0x10, NFT_SET_EVAL = 0x20, NFT_SET_OBJECT = 0x40, + NFT_SET_CONCAT = 0x80, }; /**