include: synchronize nf_tables.h with nftables tree

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
index 5b7bed5073310e22ba6e98ec52792520a38c5bed..7d6433f66bf89b4af0fd8b522f6cdc38cf0fe1c4 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -211,6 +211,29 @@ enum nft_set_flags {
        NFT_SET_MAP                     = 0x8,
 };
 
+/**
+ * enum nft_set_policies - set selection policy
+ *
+ * @NFT_SET_POL_PERFORMANCE: prefer high performance over low memory use
+ * @NFT_SET_POL_MEMORY: prefer low memory use over high performance
+ */
+enum nft_set_policies {
+       NFT_SET_POL_PERFORMANCE,
+       NFT_SET_POL_MEMORY,
+};
+
+/**
+ * enum nft_set_desc_attributes - set element description
+ *
+ * @NFTA_SET_DESC_SIZE: number of elements in set (NLA_U32)
+ */
+enum nft_set_desc_attributes {
+       NFTA_SET_DESC_UNSPEC,
+       NFTA_SET_DESC_SIZE,
+       __NFTA_SET_DESC_MAX
+};
+#define NFTA_SET_DESC_MAX      (__NFTA_SET_DESC_MAX - 1)
+
 /**
  * enum nft_set_attributes - nf_tables set netlink attributes
  *
@@ -221,6 +244,8 @@ enum nft_set_flags {
  * @NFTA_SET_KEY_LEN: key data length (NLA_U32)
  * @NFTA_SET_DATA_TYPE: mapping data type (NLA_U32)
  * @NFTA_SET_DATA_LEN: mapping data length (NLA_U32)
+ * @NFTA_SET_POLICY: selection policy (NLA_U32)
+ * @NFTA_SET_DESC: set description (NLA_NESTED)
  */
 enum nft_set_attributes {
        NFTA_SET_UNSPEC,
@@ -231,6 +256,8 @@ enum nft_set_attributes {
        NFTA_SET_KEY_LEN,
        NFTA_SET_DATA_TYPE,
        NFTA_SET_DATA_LEN,
+       NFTA_SET_POLICY,
+       NFTA_SET_DESC,
        __NFTA_SET_MAX
 };
 #define NFTA_SET_MAX           (__NFTA_SET_MAX - 1)
@@ -593,7 +620,6 @@ enum nft_meta_attributes {
  * @NFT_CT_PROTOCOL: conntrack layer 4 protocol
  * @NFT_CT_PROTO_SRC: conntrack layer 4 protocol source
  * @NFT_CT_PROTO_DST: conntrack layer 4 protocol destination
- * @NFT_CT_LABEL: conntrack label
  */
 enum nft_ct_keys {
        NFT_CT_STATE,
@@ -609,7 +635,7 @@ enum nft_ct_keys {
        NFT_CT_PROTOCOL,
        NFT_CT_PROTO_SRC,
        NFT_CT_PROTO_DST,
-       NFT_CT_LABEL,
+       NFT_CT_LABELS,
 };
 
 /**

diff --git a/src/expr/ct.c b/src/expr/ct.c
index 4c18ddecc8fea4d68ae72422016100dd3fbd5ca8..38f516984da774c8bee531a4a26f1e946f9e5ca8 100644 (file)
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -33,7 +33,7 @@ struct nft_expr_ct {
 #define IP_CT_DIR_REPLY                1
 
 #ifndef NFT_CT_MAX
-#define NFT_CT_MAX (NFT_CT_LABEL + 1)
+#define NFT_CT_MAX (NFT_CT_LABELS + 1)
 #endif
 
 static int
@@ -171,7 +171,7 @@ const char *ctkey2str_array[NFT_CT_MAX] = {
        [NFT_CT_DST]            = "dst",
        [NFT_CT_PROTO_SRC]      = "proto_src",
        [NFT_CT_PROTO_DST]      = "proto_dst",
-       [NFT_CT_LABEL]          = "label",
+       [NFT_CT_LABELS]         = "label",
 };
 
 static const char *ctkey2str(uint32_t ctkey)