History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says: ==================== Netfilter updates for net-next The following patchset contains Netfilter updates for net-next: 1) Rename 'searched' column to 'clashres' in conntrack /proc/ stats to amend a recent patch, from Florian Westphal. 2) Remove unused nft_data_debug(), from YueHaibing. 3) Remove unused definitions in IPVS, also from YueHaibing. 4) Fix user data memleak in tables and objects, this is also amending a recent patch, from Jose M. Guisado. 5) Use nla_memdup() to allocate user data in table and objects, also from Jose M. Guisado 6) User data support for chains, from Jose M. Guisado 7) Remove unused definition in nf_tables_offload, from YueHaibing. 8) Use kvzalloc() in ip_set_alloc(), from Vasily Averin. 9) Fix false positive reported by lockdep in nfnetlink mutexes, from Florian Westphal. 10) Extend fast variant of cmp for neq operation, from Phil Sutter. 11) Implement fast bitwise variant, also from Phil Sutter. ====================

David S. Miller committed 6 years ago

Commit 321e9212 parents 456afe0 10fdd6d12 files · +222 −63Browse files

Showing the changes to include/uapi (1 of 12 files). Show all

Unified · Split

include/uapi/linux/netfilter/nf_tables.h+2−0
@@ -208,6 +208,7 @@ enum nft_chain_flags { · 207 unmodified lines
208 * @NFTA_CHAIN_COUNTERS: counter specification of the chain (NLA_NESTED: nft_counter_attributes)208 * @NFTA_CHAIN_COUNTERS: counter specification of the chain (NLA_NESTED: nft_counter_attributes)
209 * @NFTA_CHAIN_FLAGS: chain flags209 * @NFTA_CHAIN_FLAGS: chain flags
210 * @NFTA_CHAIN_ID: uniquely identifies a chain in a transaction (NLA_U32)210 * @NFTA_CHAIN_ID: uniquely identifies a chain in a transaction (NLA_U32)
211 * @NFTA_CHAIN_USERDATA: user data (NLA_BINARY)
211 */212 */
212enum nft_chain_attributes {213enum nft_chain_attributes {
213 NFTA_CHAIN_UNSPEC,214 NFTA_CHAIN_UNSPEC,
@@ -222,6 +223,7 @@ enum nft_chain_attributes { · 8 unmodified lines
222 NFTA_CHAIN_PAD,223 NFTA_CHAIN_PAD,
223 NFTA_CHAIN_FLAGS,224 NFTA_CHAIN_FLAGS,
224 NFTA_CHAIN_ID,225 NFTA_CHAIN_ID,
226 NFTA_CHAIN_USERDATA,
225 __NFTA_CHAIN_MAX227 __NFTA_CHAIN_MAX
226};228};
227#define NFTA_CHAIN_MAX (__NFTA_CHAIN_MAX - 1)229#define NFTA_CHAIN_MAX (__NFTA_CHAIN_MAX - 1)