include: update internal copy of headers

To get it in sync with the existing kernel code.

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 0c4765ec911c1454112b272c6c825b10b15199ca..a7e84e46e73b017c3e5c8d540548a501c295fda3 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -415,22 +415,4 @@ enum nft_nat_attributes {
 };
 #define NFTA_NAT_MAX           (__NFTA_NAT_MAX - 1)
 
-enum nft_target_attributes {
-       NFTA_TARGET_UNSPEC,
-       NFTA_TARGET_NAME,
-       NFTA_TARGET_REV,
-       NFTA_TARGET_INFO,
-       __NFTA_TARGET_MAX
-};
-#define NFTA_TARGET_MAX                (__NFTA_TARGET_MAX - 1)
-
-enum nft_match_attributes {
-       NFTA_MATCH_UNSPEC,
-       NFTA_MATCH_NAME,
-       NFTA_MATCH_REV,
-       NFTA_MATCH_INFO,
-       __NFTA_MATCH_MAX
-};
-#define NFTA_MATCH_MAX         (__NFTA_MATCH_MAX - 1)
-
 #endif /* _LINUX_NF_TABLES_H */

diff --git a/include/linux/netfilter/nf_tables_compat.h b/include/linux/netfilter/nf_tables_compat.h
index 36fb81d8d1ca18faf5b8d9ffab1de05d9a1df1ed..de5647bc21d5a7be22ba652642eacb69229a4874 100644 (file)
--- a/include/linux/netfilter/nf_tables_compat.h
+++ b/include/linux/netfilter/nf_tables_compat.h
@@ -1,6 +1,36 @@
 #ifndef _NFT_COMPAT_NFNETLINK_H_
 #define _NFT_COMPAT_NFNETLINK_H_
 
+enum nft_target_flags {
+       NFT_TARGET_INVPROTO     = (1 << 0),
+};
+
+enum nft_target_attributes {
+       NFTA_TARGET_UNSPEC,
+       NFTA_TARGET_NAME,
+       NFTA_TARGET_REV,
+       NFTA_TARGET_INFO,
+       NFTA_TARGET_PROTOCOL,
+       NFTA_TARGET_FLAGS,
+       __NFTA_TARGET_MAX
+};
+#define NFTA_TARGET_MAX                (__NFTA_TARGET_MAX - 1)
+
+enum nft_match_flags {
+       NFT_MATCH_INVPROTO      = (1 << 0),
+};
+
+enum nft_match_attributes {
+       NFTA_MATCH_UNSPEC,
+       NFTA_MATCH_NAME,
+       NFTA_MATCH_REV,
+       NFTA_MATCH_INFO,
+       NFTA_MATCH_PROTOCOL,
+       NFTA_MATCH_FLAGS,
+       __NFTA_MATCH_MAX
+};
+#define NFTA_MATCH_MAX         (__NFTA_MATCH_MAX - 1)
+
 #define NFT_COMPAT_NAME_MAX    32
 
 enum {

diff --git a/src/expr/match.c b/src/expr/match.c
index a9e2deea43c97cba0d1fb8445b629a6040617af4..3fc8787af8fafe69cbe02e5467036ed0c15d51b6 100644 (file)
--- a/src/expr/match.c
+++ b/src/expr/match.c
@@ -19,6 +19,7 @@
 #include <libmnl/libmnl.h>
 
 #include <linux/netfilter/nf_tables.h>
+#include <linux/netfilter/nf_tables_compat.h>
 #include <linux/netfilter/x_tables.h>
 
 #include <libnftables/expr.h>

diff --git a/src/expr/target.c b/src/expr/target.c
index fccf64b51d70caf885ae679d69c7fa3b3ec5d51d..c14bf11112f7137e8e5118b88773ddc41fea6fce 100644 (file)
--- a/src/expr/target.c
+++ b/src/expr/target.c
@@ -19,6 +19,7 @@
 #include <libmnl/libmnl.h>
 
 #include <linux/netfilter/nf_tables.h>
+#include <linux/netfilter/nf_tables_compat.h>
 #include <linux/netfilter/x_tables.h>
 
 #include <libnftables/expr.h>