Hi, This patchset contains updates for the nfnetlink infrastructure and its users. 1) Add nft_pernet() helper to obtain the nftables pernet area. 2) Add the nfnl_info structure to reduce the footprint of the nfnetlink callbacks. Update the rcu, mutex and batch callbacks to use it. 3) Add a callback type field to consolidate the nfnetlink subsystem callbacks. Whenever possible, I have applied reverse xmas tree to variable definitions. Pablo Neira Ayuso (5): netfilter: nftables: add nft_pernet() helper function netfilter: nfnetlink: add struct nfnl_info and pass it to callbacks netfilter: nfnetlink: pass struct nfnl_info to rcu callbacks netfilter: nfnetlink: pass struct nfnl_info to batch callbacks netfilter: nfnetlink: consolidate callback types include/linux/netfilter/nfnetlink.h | 33 +- include/net/netfilter/nf_tables.h | 8 + net/netfilter/ipset/ip_set_core.c | 165 ++++--- net/netfilter/nf_conntrack_netlink.c | 302 ++++++------ net/netfilter/nf_tables_api.c | 663 ++++++++++++++------------- net/netfilter/nf_tables_offload.c | 10 +- net/netfilter/nfnetlink.c | 58 ++- net/netfilter/nfnetlink_acct.c | 80 ++-- net/netfilter/nfnetlink_cthelper.c | 57 +-- net/netfilter/nfnetlink_cttimeout.c | 146 +++--- net/netfilter/nfnetlink_log.c | 42 +- net/netfilter/nfnetlink_osf.c | 21 +- net/netfilter/nfnetlink_queue.c | 84 ++-- net/netfilter/nft_chain_filter.c | 5 +- net/netfilter/nft_compat.c | 32 +- net/netfilter/nft_dynset.c | 5 +- 16 files changed, 898 insertions(+), 813 deletions(-) -- 2.30.2
