include: resync nf_tables.h cache copy

Fetch recent updates to the kernel header.

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 065218a20bb7948b63994ed5bb9d2bcadcaf2d6e..30f2a87270dc5622cf616084d542cdc765193a44 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -342,6 +342,7 @@ enum nft_set_field_attributes {
  * @NFTA_SET_USERDATA: user data (NLA_BINARY)
  * @NFTA_SET_OBJ_TYPE: stateful object type (NLA_U32: NFT_OBJECT_*)
  * @NFTA_SET_HANDLE: set handle (NLA_U64)
+ * @NFTA_SET_EXPR: set expression (NLA_NESTED: nft_expr_attributes)
  */
 enum nft_set_attributes {
        NFTA_SET_UNSPEC,
@@ -361,6 +362,7 @@ enum nft_set_attributes {
        NFTA_SET_PAD,
        NFTA_SET_OBJ_TYPE,
        NFTA_SET_HANDLE,
+       NFTA_SET_EXPR,
        __NFTA_SET_MAX
 };
 #define NFTA_SET_MAX           (__NFTA_SET_MAX - 1)
@@ -1551,6 +1553,19 @@ enum nft_object_attributes {
 };
 #define NFTA_OBJ_MAX           (__NFTA_OBJ_MAX - 1)
 
+/**
+ * enum nft_flowtable_flags - nf_tables flowtable flags
+ *
+ * @NFT_FLOWTABLE_HW_OFFLOAD: flowtable hardware offload is enabled
+ * @NFT_FLOWTABLE_COUNTER: enable flow counters
+ */
+enum nft_flowtable_flags {
+       NFT_FLOWTABLE_HW_OFFLOAD        = 0x1,
+       NFT_FLOWTABLE_COUNTER           = 0x2,
+       NFT_FLOWTABLE_MASK              = (NFT_FLOWTABLE_HW_OFFLOAD |
+                                          NFT_FLOWTABLE_COUNTER)
+};
+
 /**
  * enum nft_flowtable_attributes - nf_tables flow table netlink attributes
  *
@@ -1770,6 +1785,7 @@ enum nft_tunnel_opts_attributes {
        NFTA_TUNNEL_KEY_OPTS_UNSPEC,
        NFTA_TUNNEL_KEY_OPTS_VXLAN,
        NFTA_TUNNEL_KEY_OPTS_ERSPAN,
+       NFTA_TUNNEL_KEY_OPTS_GENEVE,
        __NFTA_TUNNEL_KEY_OPTS_MAX
 };
 #define NFTA_TUNNEL_KEY_OPTS_MAX       (__NFTA_TUNNEL_KEY_OPTS_MAX - 1)
@@ -1791,6 +1807,15 @@ enum nft_tunnel_opts_erspan_attributes {
 };
 #define NFTA_TUNNEL_KEY_ERSPAN_MAX     (__NFTA_TUNNEL_KEY_ERSPAN_MAX - 1)
 
+enum nft_tunnel_opts_geneve_attributes {
+       NFTA_TUNNEL_KEY_GENEVE_UNSPEC,
+       NFTA_TUNNEL_KEY_GENEVE_CLASS,
+       NFTA_TUNNEL_KEY_GENEVE_TYPE,
+       NFTA_TUNNEL_KEY_GENEVE_DATA,
+       __NFTA_TUNNEL_KEY_GENEVE_MAX
+};
+#define NFTA_TUNNEL_KEY_GENEVE_MAX     (__NFTA_TUNNEL_KEY_GENEVE_MAX - 1)
+
 enum nft_tunnel_flags {
        NFT_TUNNEL_F_ZERO_CSUM_TX       = (1 << 0),
        NFT_TUNNEL_F_DONT_FRAGMENT      = (1 << 1),