include: update nf_tables.h.

Get header in sync with 5.7.0-rc.

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 2d291f6eab6245d80ac94ebd7b03eb33fedf49ef..30f2a87270dc5622cf616084d542cdc765193a44 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -528,8 +528,6 @@ enum nft_bitwise_ops {
  * @NFTA_BITWISE_OP: type of operation (NLA_U32: nft_bitwise_ops)
  * @NFTA_BITWISE_DATA: argument for non-boolean operations
  *                     (NLA_NESTED: nft_data_attributes)
- * @NFTA_BITWISE_MREG: mask register (NLA_U32: nft_registers)
- * @NFTA_BITWISE_XREG: xor register (NLA_U32: nft_registers)
  *
  * The bitwise expression supports boolean and shift operations.  It implements
  * the boolean operations by performing the following operation:
@@ -553,8 +551,6 @@ enum nft_bitwise_attributes {
        NFTA_BITWISE_XOR,
        NFTA_BITWISE_OP,
        NFTA_BITWISE_DATA,
-       NFTA_BITWISE_MREG,
-       NFTA_BITWISE_XREG,
        __NFTA_BITWISE_MAX
 };
 #define NFTA_BITWISE_MAX       (__NFTA_BITWISE_MAX - 1)
@@ -1557,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
  *
@@ -1776,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)
@@ -1797,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),