Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

7 files changed, 2 insertions, 788 deletions

diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild
index 17c3af2..1749154 100644
--- a/include/uapi/linux/netfilter/Kbuild
+++ b/include/uapi/linux/netfilter/Kbuild
@@ -5,8 +5,6 @@ header-y += nf_conntrack_ftp.h
 header-y += nf_conntrack_sctp.h
 header-y += nf_conntrack_tcp.h
 header-y += nf_conntrack_tuple_common.h
-header-y += nf_tables.h
-header-y += nf_tables_compat.h
 header-y += nf_nat.h
 header-y += nfnetlink.h
 header-y += nfnetlink_acct.h
diff --git a/include/uapi/linux/netfilter/ipset/ip_set.h b/include/uapi/linux/netfilter/ipset/ip_set.h
index 25d3b2f..8024cdf 100644
--- a/include/uapi/linux/netfilter/ipset/ip_set.h
+++ b/include/uapi/linux/netfilter/ipset/ip_set.h
@@ -10,14 +10,12 @@
 #ifndef _UAPI_IP_SET_H
 #define _UAPI_IP_SET_H
 
+
 #include <linux/types.h>
 
 /* The protocol version */
 #define IPSET_PROTOCOL		6
 
-/* The maximum permissible comment length we will accept over netlink */
-#define IPSET_MAX_COMMENT_SIZE	255
-
 /* The max length of strings including NUL: set and type identifiers */
 #define IPSET_MAXNAMELEN	32
 
@@ -112,7 +110,6 @@ enum {
 	IPSET_ATTR_IFACE,
 	IPSET_ATTR_BYTES,
 	IPSET_ATTR_PACKETS,
-	IPSET_ATTR_COMMENT,
 	__IPSET_ATTR_ADT_MAX,
 };
 #define IPSET_ATTR_ADT_MAX	(__IPSET_ATTR_ADT_MAX - 1)
@@ -143,7 +140,6 @@ enum ipset_errno {
 	IPSET_ERR_IPADDR_IPV4,
 	IPSET_ERR_IPADDR_IPV6,
 	IPSET_ERR_COUNTER,
-	IPSET_ERR_COMMENT,
 
 	/* Type specific error codes */
 	IPSET_ERR_TYPE_SPECIFIC = 4352,
@@ -180,8 +176,6 @@ enum ipset_cadt_flags {
 	IPSET_FLAG_NOMATCH	= (1 << IPSET_FLAG_BIT_NOMATCH),
 	IPSET_FLAG_BIT_WITH_COUNTERS = 3,
 	IPSET_FLAG_WITH_COUNTERS = (1 << IPSET_FLAG_BIT_WITH_COUNTERS),
-	IPSET_FLAG_BIT_WITH_COMMENT = 4,
-	IPSET_FLAG_WITH_COMMENT = (1 << IPSET_FLAG_BIT_WITH_COMMENT),
 	IPSET_FLAG_CADT_MAX	= 15,
 };
 
@@ -256,14 +250,6 @@ struct ip_set_req_get_set {
 #define IP_SET_OP_GET_BYINDEX	0x00000007	/* Get set name by index */
 /* Uses ip_set_req_get_set */
 
-#define IP_SET_OP_GET_FNAME	0x00000008	/* Get set index and family */
-struct ip_set_req_get_set_family {
-	unsigned int op;
-	unsigned int version;
-	unsigned int family;
-	union ip_set_name_index set;
-};
-
 #define IP_SET_OP_VERSION	0x00000100	/* Ask kernel version */
 struct ip_set_req_version {
 	unsigned int op;
diff --git a/include/uapi/linux/netfilter/nf_conntrack_common.h b/include/uapi/linux/netfilter/nf_conntrack_common.h
index 319f471..8dd8038 100644
--- a/include/uapi/linux/netfilter/nf_conntrack_common.h
+++ b/include/uapi/linux/netfilter/nf_conntrack_common.h
@@ -25,10 +25,6 @@ enum ip_conntrack_info {
 	IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1
 };
 
-#define NF_CT_STATE_INVALID_BIT			(1 << 0)
-#define NF_CT_STATE_BIT(ctinfo)			(1 << ((ctinfo) % IP_CT_IS_REPLY + 1))
-#define NF_CT_STATE_UNTRACKED_BIT		(1 << (IP_CT_NUMBER + 1))
-
 /* Bitset representing status of connection. */
 enum ip_conntrack_status {
 	/* It's an expected connection: bit 0 set.  This bit never changed */
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
deleted file mode 100644
index fbfd229..0000000
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ /dev/null
@@ -1,718 +0,0 @@
-#ifndef _LINUX_NF_TABLES_H
-#define _LINUX_NF_TABLES_H
-
-#define NFT_CHAIN_MAXNAMELEN 32
-
-enum nft_registers {
-	NFT_REG_VERDICT,
-	NFT_REG_1,
-	NFT_REG_2,
-	NFT_REG_3,
-	NFT_REG_4,
-	__NFT_REG_MAX
-};
-#define NFT_REG_MAX	(__NFT_REG_MAX - 1)
-
-/**
- * enum nft_verdicts - nf_tables internal verdicts
- *
- * @NFT_CONTINUE: continue evaluation of the current rule
- * @NFT_BREAK: terminate evaluation of the current rule
- * @NFT_JUMP: push the current chain on the jump stack and jump to a chain
- * @NFT_GOTO: jump to a chain without pushing the current chain on the jump stack
- * @NFT_RETURN: return to the topmost chain on the jump stack
- *
- * The nf_tables verdicts share their numeric space with the netfilter verdicts.
- */
-enum nft_verdicts {
-	NFT_CONTINUE	= -1,
-	NFT_BREAK	= -2,
-	NFT_JUMP	= -3,
-	NFT_GOTO	= -4,
-	NFT_RETURN	= -5,
-};
-
-/**
- * enum nf_tables_msg_types - nf_tables netlink message types
- *
- * @NFT_MSG_NEWTABLE: create a new table (enum nft_table_attributes)
- * @NFT_MSG_GETTABLE: get a table (enum nft_table_attributes)
- * @NFT_MSG_DELTABLE: delete a table (enum nft_table_attributes)
- * @NFT_MSG_NEWCHAIN: create a new chain (enum nft_chain_attributes)
- * @NFT_MSG_GETCHAIN: get a chain (enum nft_chain_attributes)
- * @NFT_MSG_DELCHAIN: delete a chain (enum nft_chain_attributes)
- * @NFT_MSG_NEWRULE: create a new rule (enum nft_rule_attributes)
- * @NFT_MSG_GETRULE: get a rule (enum nft_rule_attributes)
- * @NFT_MSG_DELRULE: delete a rule (enum nft_rule_attributes)
- * @NFT_MSG_NEWSET: create a new set (enum nft_set_attributes)
- * @NFT_MSG_GETSET: get a set (enum nft_set_attributes)
- * @NFT_MSG_DELSET: delete a set (enum nft_set_attributes)
- * @NFT_MSG_NEWSETELEM: create a new set element (enum nft_set_elem_attributes)
- * @NFT_MSG_GETSETELEM: get a set element (enum nft_set_elem_attributes)
- * @NFT_MSG_DELSETELEM: delete a set element (enum nft_set_elem_attributes)
- */
-enum nf_tables_msg_types {
-	NFT_MSG_NEWTABLE,
-	NFT_MSG_GETTABLE,
-	NFT_MSG_DELTABLE,
-	NFT_MSG_NEWCHAIN,
-	NFT_MSG_GETCHAIN,
-	NFT_MSG_DELCHAIN,
-	NFT_MSG_NEWRULE,
-	NFT_MSG_GETRULE,
-	NFT_MSG_DELRULE,
-	NFT_MSG_NEWSET,
-	NFT_MSG_GETSET,
-	NFT_MSG_DELSET,
-	NFT_MSG_NEWSETELEM,
-	NFT_MSG_GETSETELEM,
-	NFT_MSG_DELSETELEM,
-	NFT_MSG_MAX,
-};
-
-/**
- * enum nft_list_attributes - nf_tables generic list netlink attributes
- *
- * @NFTA_LIST_ELEM: list element (NLA_NESTED)
- */
-enum nft_list_attributes {
-	NFTA_LIST_UNPEC,
-	NFTA_LIST_ELEM,
-	__NFTA_LIST_MAX
-};
-#define NFTA_LIST_MAX		(__NFTA_LIST_MAX - 1)
-
-/**
- * enum nft_hook_attributes - nf_tables netfilter hook netlink attributes
- *
- * @NFTA_HOOK_HOOKNUM: netfilter hook number (NLA_U32)
- * @NFTA_HOOK_PRIORITY: netfilter hook priority (NLA_U32)
- */
-enum nft_hook_attributes {
-	NFTA_HOOK_UNSPEC,
-	NFTA_HOOK_HOOKNUM,
-	NFTA_HOOK_PRIORITY,
-	__NFTA_HOOK_MAX
-};
-#define NFTA_HOOK_MAX		(__NFTA_HOOK_MAX - 1)
-
-/**
- * enum nft_table_flags - nf_tables table flags
- *
- * @NFT_TABLE_F_DORMANT: this table is not active
- */
-enum nft_table_flags {
-	NFT_TABLE_F_DORMANT	= 0x1,
-};
-
-/**
- * enum nft_table_attributes - nf_tables table netlink attributes
- *
- * @NFTA_TABLE_NAME: name of the table (NLA_STRING)
- * @NFTA_TABLE_FLAGS: bitmask of enum nft_table_flags (NLA_U32)
- */
-enum nft_table_attributes {
-	NFTA_TABLE_UNSPEC,
-	NFTA_TABLE_NAME,
-	NFTA_TABLE_FLAGS,
-	__NFTA_TABLE_MAX
-};
-#define NFTA_TABLE_MAX		(__NFTA_TABLE_MAX - 1)
-
-/**
- * enum nft_chain_attributes - nf_tables chain netlink attributes
- *
- * @NFTA_CHAIN_TABLE: name of the table containing the chain (NLA_STRING)
- * @NFTA_CHAIN_HANDLE: numeric handle of the chain (NLA_U64)
- * @NFTA_CHAIN_NAME: name of the chain (NLA_STRING)
- * @NFTA_CHAIN_HOOK: hook specification for basechains (NLA_NESTED: nft_hook_attributes)
- * @NFTA_CHAIN_POLICY: numeric policy of the chain (NLA_U32)
- * @NFTA_CHAIN_USE: number of references to this chain (NLA_U32)
- * @NFTA_CHAIN_TYPE: type name of the string (NLA_NUL_STRING)
- * @NFTA_CHAIN_COUNTERS: counter specification of the chain (NLA_NESTED: nft_counter_attributes)
- */
-enum nft_chain_attributes {
-	NFTA_CHAIN_UNSPEC,
-	NFTA_CHAIN_TABLE,
-	NFTA_CHAIN_HANDLE,
-	NFTA_CHAIN_NAME,
-	NFTA_CHAIN_HOOK,
-	NFTA_CHAIN_POLICY,
-	NFTA_CHAIN_USE,
-	NFTA_CHAIN_TYPE,
-	NFTA_CHAIN_COUNTERS,
-	__NFTA_CHAIN_MAX
-};
-#define NFTA_CHAIN_MAX		(__NFTA_CHAIN_MAX - 1)
-
-/**
- * enum nft_rule_attributes - nf_tables rule netlink attributes
- *
- * @NFTA_RULE_TABLE: name of the table containing the rule (NLA_STRING)
- * @NFTA_RULE_CHAIN: name of the chain containing the rule (NLA_STRING)
- * @NFTA_RULE_HANDLE: numeric handle of the rule (NLA_U64)
- * @NFTA_RULE_EXPRESSIONS: list of expressions (NLA_NESTED: nft_expr_attributes)
- * @NFTA_RULE_COMPAT: compatibility specifications of the rule (NLA_NESTED: nft_rule_compat_attributes)
- * @NFTA_RULE_POSITION: numeric handle of the previous rule (NLA_U64)
- */
-enum nft_rule_attributes {
-	NFTA_RULE_UNSPEC,
-	NFTA_RULE_TABLE,
-	NFTA_RULE_CHAIN,
-	NFTA_RULE_HANDLE,
-	NFTA_RULE_EXPRESSIONS,
-	NFTA_RULE_COMPAT,
-	NFTA_RULE_POSITION,
-	__NFTA_RULE_MAX
-};
-#define NFTA_RULE_MAX		(__NFTA_RULE_MAX - 1)
-
-/**
- * enum nft_rule_compat_flags - nf_tables rule compat flags
- *
- * @NFT_RULE_COMPAT_F_INV: invert the check result
- */
-enum nft_rule_compat_flags {
-	NFT_RULE_COMPAT_F_INV	= (1 << 1),
-	NFT_RULE_COMPAT_F_MASK	= NFT_RULE_COMPAT_F_INV,
-};
-
-/**
- * enum nft_rule_compat_attributes - nf_tables rule compat attributes
- *
- * @NFTA_RULE_COMPAT_PROTO: numerice value of handled protocol (NLA_U32)
- * @NFTA_RULE_COMPAT_FLAGS: bitmask of enum nft_rule_compat_flags (NLA_U32)
- */
-enum nft_rule_compat_attributes {
-	NFTA_RULE_COMPAT_UNSPEC,
-	NFTA_RULE_COMPAT_PROTO,
-	NFTA_RULE_COMPAT_FLAGS,
-	__NFTA_RULE_COMPAT_MAX
-};
-#define NFTA_RULE_COMPAT_MAX	(__NFTA_RULE_COMPAT_MAX - 1)
-
-/**
- * enum nft_set_flags - nf_tables set flags
- *
- * @NFT_SET_ANONYMOUS: name allocation, automatic cleanup on unlink
- * @NFT_SET_CONSTANT: set contents may not change while bound
- * @NFT_SET_INTERVAL: set contains intervals
- * @NFT_SET_MAP: set is used as a dictionary
- */
-enum nft_set_flags {
-	NFT_SET_ANONYMOUS		= 0x1,
-	NFT_SET_CONSTANT		= 0x2,
-	NFT_SET_INTERVAL		= 0x4,
-	NFT_SET_MAP			= 0x8,
-};
-
-/**
- * enum nft_set_attributes - nf_tables set netlink attributes
- *
- * @NFTA_SET_TABLE: table name (NLA_STRING)
- * @NFTA_SET_NAME: set name (NLA_STRING)
- * @NFTA_SET_FLAGS: bitmask of enum nft_set_flags (NLA_U32)
- * @NFTA_SET_KEY_TYPE: key data type, informational purpose only (NLA_U32)
- * @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)
- */
-enum nft_set_attributes {
-	NFTA_SET_UNSPEC,
-	NFTA_SET_TABLE,
-	NFTA_SET_NAME,
-	NFTA_SET_FLAGS,
-	NFTA_SET_KEY_TYPE,
-	NFTA_SET_KEY_LEN,
-	NFTA_SET_DATA_TYPE,
-	NFTA_SET_DATA_LEN,
-	__NFTA_SET_MAX
-};
-#define NFTA_SET_MAX		(__NFTA_SET_MAX - 1)
-
-/**
- * enum nft_set_elem_flags - nf_tables set element flags
- *
- * @NFT_SET_ELEM_INTERVAL_END: element ends the previous interval
- */
-enum nft_set_elem_flags {
-	NFT_SET_ELEM_INTERVAL_END	= 0x1,
-};
-
-/**
- * enum nft_set_elem_attributes - nf_tables set element netlink attributes
- *
- * @NFTA_SET_ELEM_KEY: key value (NLA_NESTED: nft_data)
- * @NFTA_SET_ELEM_DATA: data value of mapping (NLA_NESTED: nft_data_attributes)
- * @NFTA_SET_ELEM_FLAGS: bitmask of nft_set_elem_flags (NLA_U32)
- */
-enum nft_set_elem_attributes {
-	NFTA_SET_ELEM_UNSPEC,
-	NFTA_SET_ELEM_KEY,
-	NFTA_SET_ELEM_DATA,
-	NFTA_SET_ELEM_FLAGS,
-	__NFTA_SET_ELEM_MAX
-};
-#define NFTA_SET_ELEM_MAX	(__NFTA_SET_ELEM_MAX - 1)
-
-/**
- * enum nft_set_elem_list_attributes - nf_tables set element list netlink attributes
- *
- * @NFTA_SET_ELEM_LIST_TABLE: table of the set to be changed (NLA_STRING)
- * @NFTA_SET_ELEM_LIST_SET: name of the set to be changed (NLA_STRING)
- * @NFTA_SET_ELEM_LIST_ELEMENTS: list of set elements (NLA_NESTED: nft_set_elem_attributes)
- */
-enum nft_set_elem_list_attributes {
-	NFTA_SET_ELEM_LIST_UNSPEC,
-	NFTA_SET_ELEM_LIST_TABLE,
-	NFTA_SET_ELEM_LIST_SET,
-	NFTA_SET_ELEM_LIST_ELEMENTS,
-	__NFTA_SET_ELEM_LIST_MAX
-};
-#define NFTA_SET_ELEM_LIST_MAX	(__NFTA_SET_ELEM_LIST_MAX - 1)
-
-/**
- * enum nft_data_types - nf_tables data types
- *
- * @NFT_DATA_VALUE: generic data
- * @NFT_DATA_VERDICT: netfilter verdict
- *
- * The type of data is usually determined by the kernel directly and is not
- * explicitly specified by userspace. The only difference are sets, where
- * userspace specifies the key and mapping data types.
- *
- * The values 0xffffff00-0xffffffff are reserved for internally used types.
- * The remaining range can be freely used by userspace to encode types, all
- * values are equivalent to NFT_DATA_VALUE.
- */
-enum nft_data_types {
-	NFT_DATA_VALUE,
-	NFT_DATA_VERDICT	= 0xffffff00U,
-};
-
-#define NFT_DATA_RESERVED_MASK	0xffffff00U
-
-/**
- * enum nft_data_attributes - nf_tables data netlink attributes
- *
- * @NFTA_DATA_VALUE: generic data (NLA_BINARY)
- * @NFTA_DATA_VERDICT: nf_tables verdict (NLA_NESTED: nft_verdict_attributes)
- */
-enum nft_data_attributes {
-	NFTA_DATA_UNSPEC,
-	NFTA_DATA_VALUE,
-	NFTA_DATA_VERDICT,
-	__NFTA_DATA_MAX
-};
-#define NFTA_DATA_MAX		(__NFTA_DATA_MAX - 1)
-
-/**
- * enum nft_verdict_attributes - nf_tables verdict netlink attributes
- *
- * @NFTA_VERDICT_CODE: nf_tables verdict (NLA_U32: enum nft_verdicts)
- * @NFTA_VERDICT_CHAIN: jump target chain name (NLA_STRING)
- */
-enum nft_verdict_attributes {
-	NFTA_VERDICT_UNSPEC,
-	NFTA_VERDICT_CODE,
-	NFTA_VERDICT_CHAIN,
-	__NFTA_VERDICT_MAX
-};
-#define NFTA_VERDICT_MAX	(__NFTA_VERDICT_MAX - 1)
-
-/**
- * enum nft_expr_attributes - nf_tables expression netlink attributes
- *
- * @NFTA_EXPR_NAME: name of the expression type (NLA_STRING)
- * @NFTA_EXPR_DATA: type specific data (NLA_NESTED)
- */
-enum nft_expr_attributes {
-	NFTA_EXPR_UNSPEC,
-	NFTA_EXPR_NAME,
-	NFTA_EXPR_DATA,
-	__NFTA_EXPR_MAX
-};
-#define NFTA_EXPR_MAX		(__NFTA_EXPR_MAX - 1)
-
-/**
- * enum nft_immediate_attributes - nf_tables immediate expression netlink attributes
- *
- * @NFTA_IMMEDIATE_DREG: destination register to load data into (NLA_U32)
- * @NFTA_IMMEDIATE_DATA: data to load (NLA_NESTED: nft_data_attributes)
- */
-enum nft_immediate_attributes {
-	NFTA_IMMEDIATE_UNSPEC,
-	NFTA_IMMEDIATE_DREG,
-	NFTA_IMMEDIATE_DATA,
-	__NFTA_IMMEDIATE_MAX
-};
-#define NFTA_IMMEDIATE_MAX	(__NFTA_IMMEDIATE_MAX - 1)
-
-/**
- * enum nft_bitwise_attributes - nf_tables bitwise expression netlink attributes
- *
- * @NFTA_BITWISE_SREG: source register (NLA_U32: nft_registers)
- * @NFTA_BITWISE_DREG: destination register (NLA_U32: nft_registers)
- * @NFTA_BITWISE_LEN: length of operands (NLA_U32)
- * @NFTA_BITWISE_MASK: mask value (NLA_NESTED: nft_data_attributes)
- * @NFTA_BITWISE_XOR: xor value (NLA_NESTED: nft_data_attributes)
- *
- * The bitwise expression performs the following operation:
- *
- * dreg = (sreg & mask) ^ xor
- *
- * which allow to express all bitwise operations:
- *
- * 		mask	xor
- * NOT:		1	1
- * OR:		0	x
- * XOR:		1	x
- * AND:		x	0
- */
-enum nft_bitwise_attributes {
-	NFTA_BITWISE_UNSPEC,
-	NFTA_BITWISE_SREG,
-	NFTA_BITWISE_DREG,
-	NFTA_BITWISE_LEN,
-	NFTA_BITWISE_MASK,
-	NFTA_BITWISE_XOR,
-	__NFTA_BITWISE_MAX
-};
-#define NFTA_BITWISE_MAX	(__NFTA_BITWISE_MAX - 1)
-
-/**
- * enum nft_byteorder_ops - nf_tables byteorder operators
- *
- * @NFT_BYTEORDER_NTOH: network to host operator
- * @NFT_BYTEORDER_HTON: host to network opertaor
- */
-enum nft_byteorder_ops {
-	NFT_BYTEORDER_NTOH,
-	NFT_BYTEORDER_HTON,
-};
-
-/**
- * enum nft_byteorder_attributes - nf_tables byteorder expression netlink attributes
- *
- * @NFTA_BYTEORDER_SREG: source register (NLA_U32: nft_registers)
- * @NFTA_BYTEORDER_DREG: destination register (NLA_U32: nft_registers)
- * @NFTA_BYTEORDER_OP: operator (NLA_U32: enum nft_byteorder_ops)
- * @NFTA_BYTEORDER_LEN: length of the data (NLA_U32)
- * @NFTA_BYTEORDER_SIZE: data size in bytes (NLA_U32: 2 or 4)
- */
-enum nft_byteorder_attributes {
-	NFTA_BYTEORDER_UNSPEC,
-	NFTA_BYTEORDER_SREG,
-	NFTA_BYTEORDER_DREG,
-	NFTA_BYTEORDER_OP,
-	NFTA_BYTEORDER_LEN,
-	NFTA_BYTEORDER_SIZE,
-	__NFTA_BYTEORDER_MAX
-};
-#define NFTA_BYTEORDER_MAX	(__NFTA_BYTEORDER_MAX - 1)
-
-/**
- * enum nft_cmp_ops - nf_tables relational operator
- *
- * @NFT_CMP_EQ: equal
- * @NFT_CMP_NEQ: not equal
- * @NFT_CMP_LT: less than
- * @NFT_CMP_LTE: less than or equal to
- * @NFT_CMP_GT: greater than
- * @NFT_CMP_GTE: greater than or equal to
- */
-enum nft_cmp_ops {
-	NFT_CMP_EQ,
-	NFT_CMP_NEQ,
-	NFT_CMP_LT,
-	NFT_CMP_LTE,
-	NFT_CMP_GT,
-	NFT_CMP_GTE,
-};
-
-/**
- * enum nft_cmp_attributes - nf_tables cmp expression netlink attributes
- *
- * @NFTA_CMP_SREG: source register of data to compare (NLA_U32: nft_registers)
- * @NFTA_CMP_OP: cmp operation (NLA_U32: nft_cmp_ops)
- * @NFTA_CMP_DATA: data to compare against (NLA_NESTED: nft_data_attributes)
- */
-enum nft_cmp_attributes {
-	NFTA_CMP_UNSPEC,
-	NFTA_CMP_SREG,
-	NFTA_CMP_OP,
-	NFTA_CMP_DATA,
-	__NFTA_CMP_MAX
-};
-#define NFTA_CMP_MAX		(__NFTA_CMP_MAX - 1)
-
-/**
- * enum nft_lookup_attributes - nf_tables set lookup expression netlink attributes
- *
- * @NFTA_LOOKUP_SET: name of the set where to look for (NLA_STRING)
- * @NFTA_LOOKUP_SREG: source register of the data to look for (NLA_U32: nft_registers)
- * @NFTA_LOOKUP_DREG: destination register (NLA_U32: nft_registers)
- */
-enum nft_lookup_attributes {
-	NFTA_LOOKUP_UNSPEC,
-	NFTA_LOOKUP_SET,
-	NFTA_LOOKUP_SREG,
-	NFTA_LOOKUP_DREG,
-	__NFTA_LOOKUP_MAX
-};
-#define NFTA_LOOKUP_MAX		(__NFTA_LOOKUP_MAX - 1)
-
-/**
- * enum nft_payload_bases - nf_tables payload expression offset bases
- *
- * @NFT_PAYLOAD_LL_HEADER: link layer header
- * @NFT_PAYLOAD_NETWORK_HEADER: network header
- * @NFT_PAYLOAD_TRANSPORT_HEADER: transport header
- */
-enum nft_payload_bases {
-	NFT_PAYLOAD_LL_HEADER,
-	NFT_PAYLOAD_NETWORK_HEADER,
-	NFT_PAYLOAD_TRANSPORT_HEADER,
-};
-
-/**
- * enum nft_payload_attributes - nf_tables payload expression netlink attributes
- *
- * @NFTA_PAYLOAD_DREG: destination register to load data into (NLA_U32: nft_registers)
- * @NFTA_PAYLOAD_BASE: payload base (NLA_U32: nft_payload_bases)
- * @NFTA_PAYLOAD_OFFSET: payload offset relative to base (NLA_U32)
- * @NFTA_PAYLOAD_LEN: payload length (NLA_U32)
- */
-enum nft_payload_attributes {
-	NFTA_PAYLOAD_UNSPEC,
-	NFTA_PAYLOAD_DREG,
-	NFTA_PAYLOAD_BASE,
-	NFTA_PAYLOAD_OFFSET,
-	NFTA_PAYLOAD_LEN,
-	__NFTA_PAYLOAD_MAX
-};
-#define NFTA_PAYLOAD_MAX	(__NFTA_PAYLOAD_MAX - 1)
-
-/**
- * enum nft_exthdr_attributes - nf_tables IPv6 extension header expression netlink attributes
- *
- * @NFTA_EXTHDR_DREG: destination register (NLA_U32: nft_registers)
- * @NFTA_EXTHDR_TYPE: extension header type (NLA_U8)
- * @NFTA_EXTHDR_OFFSET: extension header offset (NLA_U32)
- * @NFTA_EXTHDR_LEN: extension header length (NLA_U32)
- */
-enum nft_exthdr_attributes {
-	NFTA_EXTHDR_UNSPEC,
-	NFTA_EXTHDR_DREG,
-	NFTA_EXTHDR_TYPE,
-	NFTA_EXTHDR_OFFSET,
-	NFTA_EXTHDR_LEN,
-	__NFTA_EXTHDR_MAX
-};
-#define NFTA_EXTHDR_MAX		(__NFTA_EXTHDR_MAX - 1)
-
-/**
- * enum nft_meta_keys - nf_tables meta expression keys
- *
- * @NFT_META_LEN: packet length (skb->len)
- * @NFT_META_PROTOCOL: packet ethertype protocol (skb->protocol), invalid in OUTPUT
- * @NFT_META_PRIORITY: packet priority (skb->priority)
- * @NFT_META_MARK: packet mark (skb->mark)
- * @NFT_META_IIF: packet input interface index (dev->ifindex)
- * @NFT_META_OIF: packet output interface index (dev->ifindex)
- * @NFT_META_IIFNAME: packet input interface name (dev->name)
- * @NFT_META_OIFNAME: packet output interface name (dev->name)
- * @NFT_META_IIFTYPE: packet input interface type (dev->type)
- * @NFT_META_OIFTYPE: packet output interface type (dev->type)
- * @NFT_META_SKUID: originating socket UID (fsuid)
- * @NFT_META_SKGID: originating socket GID (fsgid)
- * @NFT_META_NFTRACE: packet nftrace bit
- * @NFT_META_RTCLASSID: realm value of packet's route (skb->dst->tclassid)
- * @NFT_META_SECMARK: packet secmark (skb->secmark)
- */
-enum nft_meta_keys {
-	NFT_META_LEN,
-	NFT_META_PROTOCOL,
-	NFT_META_PRIORITY,
-	NFT_META_MARK,
-	NFT_META_IIF,
-	NFT_META_OIF,
-	NFT_META_IIFNAME,
-	NFT_META_OIFNAME,
-	NFT_META_IIFTYPE,
-	NFT_META_OIFTYPE,
-	NFT_META_SKUID,
-	NFT_META_SKGID,
-	NFT_META_NFTRACE,
-	NFT_META_RTCLASSID,
-	NFT_META_SECMARK,
-};
-
-/**
- * enum nft_meta_attributes - nf_tables meta expression netlink attributes
- *
- * @NFTA_META_DREG: destination register (NLA_U32)
- * @NFTA_META_KEY: meta data item to load (NLA_U32: nft_meta_keys)
- */
-enum nft_meta_attributes {
-	NFTA_META_UNSPEC,
-	NFTA_META_DREG,
-	NFTA_META_KEY,
-	__NFTA_META_MAX
-};
-#define NFTA_META_MAX		(__NFTA_META_MAX - 1)
-
-/**
- * enum nft_ct_keys - nf_tables ct expression keys
- *
- * @NFT_CT_STATE: conntrack state (bitmask of enum ip_conntrack_info)
- * @NFT_CT_DIRECTION: conntrack direction (enum ip_conntrack_dir)
- * @NFT_CT_STATUS: conntrack status (bitmask of enum ip_conntrack_status)
- * @NFT_CT_MARK: conntrack mark value
- * @NFT_CT_SECMARK: conntrack secmark value
- * @NFT_CT_EXPIRATION: relative conntrack expiration time in ms
- * @NFT_CT_HELPER: connection tracking helper assigned to conntrack
- * @NFT_CT_L3PROTOCOL: conntrack layer 3 protocol
- * @NFT_CT_SRC: conntrack layer 3 protocol source (IPv4/IPv6 address)
- * @NFT_CT_DST: conntrack layer 3 protocol destination (IPv4/IPv6 address)
- * @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
- */
-enum nft_ct_keys {
-	NFT_CT_STATE,
-	NFT_CT_DIRECTION,
-	NFT_CT_STATUS,
-	NFT_CT_MARK,
-	NFT_CT_SECMARK,
-	NFT_CT_EXPIRATION,
-	NFT_CT_HELPER,
-	NFT_CT_L3PROTOCOL,
-	NFT_CT_SRC,
-	NFT_CT_DST,
-	NFT_CT_PROTOCOL,
-	NFT_CT_PROTO_SRC,
-	NFT_CT_PROTO_DST,
-};
-
-/**
- * enum nft_ct_attributes - nf_tables ct expression netlink attributes
- *
- * @NFTA_CT_DREG: destination register (NLA_U32)
- * @NFTA_CT_KEY: conntrack data item to load (NLA_U32: nft_ct_keys)
- * @NFTA_CT_DIRECTION: direction in case of directional keys (NLA_U8)
- */
-enum nft_ct_attributes {
-	NFTA_CT_UNSPEC,
-	NFTA_CT_DREG,
-	NFTA_CT_KEY,
-	NFTA_CT_DIRECTION,
-	__NFTA_CT_MAX
-};
-#define NFTA_CT_MAX		(__NFTA_CT_MAX - 1)
-
-/**
- * enum nft_limit_attributes - nf_tables limit expression netlink attributes
- *
- * @NFTA_LIMIT_RATE: refill rate (NLA_U64)
- * @NFTA_LIMIT_UNIT: refill unit (NLA_U64)
- */
-enum nft_limit_attributes {
-	NFTA_LIMIT_UNSPEC,
-	NFTA_LIMIT_RATE,
-	NFTA_LIMIT_UNIT,
-	__NFTA_LIMIT_MAX
-};
-#define NFTA_LIMIT_MAX		(__NFTA_LIMIT_MAX - 1)
-
-/**
- * enum nft_counter_attributes - nf_tables counter expression netlink attributes
- *
- * @NFTA_COUNTER_BYTES: number of bytes (NLA_U64)
- * @NFTA_COUNTER_PACKETS: number of packets (NLA_U64)
- */
-enum nft_counter_attributes {
-	NFTA_COUNTER_UNSPEC,
-	NFTA_COUNTER_BYTES,
-	NFTA_COUNTER_PACKETS,
-	__NFTA_COUNTER_MAX
-};
-#define NFTA_COUNTER_MAX	(__NFTA_COUNTER_MAX - 1)
-
-/**
- * enum nft_log_attributes - nf_tables log expression netlink attributes
- *
- * @NFTA_LOG_GROUP: netlink group to send messages to (NLA_U32)
- * @NFTA_LOG_PREFIX: prefix to prepend to log messages (NLA_STRING)
- * @NFTA_LOG_SNAPLEN: length of payload to include in netlink message (NLA_U32)
- * @NFTA_LOG_QTHRESHOLD: queue threshold (NLA_U32)
- */
-enum nft_log_attributes {
-	NFTA_LOG_UNSPEC,
-	NFTA_LOG_GROUP,
-	NFTA_LOG_PREFIX,
-	NFTA_LOG_SNAPLEN,
-	NFTA_LOG_QTHRESHOLD,
-	__NFTA_LOG_MAX
-};
-#define NFTA_LOG_MAX		(__NFTA_LOG_MAX - 1)
-
-/**
- * enum nft_reject_types - nf_tables reject expression reject types
- *
- * @NFT_REJECT_ICMP_UNREACH: reject using ICMP unreachable
- * @NFT_REJECT_TCP_RST: reject using TCP RST
- */
-enum nft_reject_types {
-	NFT_REJECT_ICMP_UNREACH,
-	NFT_REJECT_TCP_RST,
-};
-
-/**
- * enum nft_reject_attributes - nf_tables reject expression netlink attributes
- *
- * @NFTA_REJECT_TYPE: packet type to use (NLA_U32: nft_reject_types)
- * @NFTA_REJECT_ICMP_CODE: ICMP code to use (NLA_U8)
- */
-enum nft_reject_attributes {
-	NFTA_REJECT_UNSPEC,
-	NFTA_REJECT_TYPE,
-	NFTA_REJECT_ICMP_CODE,
-	__NFTA_REJECT_MAX
-};
-#define NFTA_REJECT_MAX		(__NFTA_REJECT_MAX - 1)
-
-/**
- * enum nft_nat_types - nf_tables nat expression NAT types
- *
- * @NFT_NAT_SNAT: source NAT
- * @NFT_NAT_DNAT: destination NAT
- */
-enum nft_nat_types {
-	NFT_NAT_SNAT,
-	NFT_NAT_DNAT,
-};
-
-/**
- * enum nft_nat_attributes - nf_tables nat expression netlink attributes
- *
- * @NFTA_NAT_TYPE: NAT type (NLA_U32: nft_nat_types)
- * @NFTA_NAT_FAMILY: NAT family (NLA_U32)
- * @NFTA_NAT_REG_ADDR_MIN: source register of address range start (NLA_U32: nft_registers)
- * @NFTA_NAT_REG_ADDR_MAX: source register of address range end (NLA_U32: nft_registers)
- * @NFTA_NAT_REG_PROTO_MIN: source register of proto range start (NLA_U32: nft_registers)
- * @NFTA_NAT_REG_PROTO_MAX: source register of proto range end (NLA_U32: nft_registers)
- */
-enum nft_nat_attributes {
-	NFTA_NAT_UNSPEC,
-	NFTA_NAT_TYPE,
-	NFTA_NAT_FAMILY,
-	NFTA_NAT_REG_ADDR_MIN,
-	NFTA_NAT_REG_ADDR_MAX,
-	NFTA_NAT_REG_PROTO_MIN,
-	NFTA_NAT_REG_PROTO_MAX,
-	__NFTA_NAT_MAX
-};
-#define NFTA_NAT_MAX		(__NFTA_NAT_MAX - 1)
-
-#endif /* _LINUX_NF_TABLES_H */
diff --git a/include/uapi/linux/netfilter/nf_tables_compat.h b/include/uapi/linux/netfilter/nf_tables_compat.h
deleted file mode 100644
index 8310f5f..0000000
--- a/include/uapi/linux/netfilter/nf_tables_compat.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _NFT_COMPAT_NFNETLINK_H_
-#define _NFT_COMPAT_NFNETLINK_H_
-
-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)
-
-#define NFT_COMPAT_NAME_MAX	32
-
-enum {
-	NFNL_MSG_COMPAT_GET,
-	NFNL_MSG_COMPAT_MAX
-};
-
-enum {
-	NFTA_COMPAT_UNSPEC = 0,
-	NFTA_COMPAT_NAME,
-	NFTA_COMPAT_REV,
-	NFTA_COMPAT_TYPE,
-	__NFTA_COMPAT_MAX,
-};
-#define NFTA_COMPAT_MAX (__NFTA_COMPAT_MAX - 1)
-
-#endif
diff --git a/include/uapi/linux/netfilter/nfnetlink.h b/include/uapi/linux/netfilter/nfnetlink.h
index 596ddd4..4a4efaf 100644
--- a/include/uapi/linux/netfilter/nfnetlink.h
+++ b/include/uapi/linux/netfilter/nfnetlink.h
@@ -18,8 +18,6 @@ enum nfnetlink_groups {
 #define NFNLGRP_CONNTRACK_EXP_UPDATE	NFNLGRP_CONNTRACK_EXP_UPDATE
 	NFNLGRP_CONNTRACK_EXP_DESTROY,
 #define NFNLGRP_CONNTRACK_EXP_DESTROY	NFNLGRP_CONNTRACK_EXP_DESTROY
-	NFNLGRP_NFTABLES,
-#define NFNLGRP_NFTABLES                NFNLGRP_NFTABLES
 	__NFNLGRP_MAX,
 };
 #define NFNLGRP_MAX	(__NFNLGRP_MAX - 1)
@@ -53,12 +51,6 @@ struct nfgenmsg {
 #define NFNL_SUBSYS_ACCT		7
 #define NFNL_SUBSYS_CTNETLINK_TIMEOUT	8
 #define NFNL_SUBSYS_CTHELPER		9
-#define NFNL_SUBSYS_NFTABLES		10
-#define NFNL_SUBSYS_NFT_COMPAT		11
-#define NFNL_SUBSYS_COUNT		12
-
-/* Reserved control nfnetlink messages */
-#define NFNL_MSG_BATCH_BEGIN		NLMSG_MIN_TYPE
-#define NFNL_MSG_BATCH_END		NLMSG_MIN_TYPE+1
+#define NFNL_SUBSYS_COUNT		10
 
 #endif /* _UAPI_NFNETLINK_H */
diff --git a/include/uapi/linux/netfilter/nfnetlink_cttimeout.h b/include/uapi/linux/netfilter/nfnetlink_cttimeout.h
index 1ab0b97..a2810a7 100644
--- a/include/uapi/linux/netfilter/nfnetlink_cttimeout.h
+++ b/include/uapi/linux/netfilter/nfnetlink_cttimeout.h
@@ -6,8 +6,6 @@ enum ctnl_timeout_msg_types {
 	IPCTNL_MSG_TIMEOUT_NEW,
 	IPCTNL_MSG_TIMEOUT_GET,
 	IPCTNL_MSG_TIMEOUT_DELETE,
-	IPCTNL_MSG_TIMEOUT_DEFAULT_SET,
-	IPCTNL_MSG_TIMEOUT_DEFAULT_GET,
 
 	IPCTNL_MSG_TIMEOUT_MAX
 };