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) Support for SCTP chunks matching on nf_tables, from Phil Sutter. 2) Skip LDMXCSR, we don't need a valid MXCSR state. From Stefano Brivio. 3) CONFIG_RETPOLINE for nf_tables set lookups, from Florian Westphal. 4) A few Kconfig leading spaces removal, from Juerg Haefliger. 5) Remove spinlock from xt_limit, from Jason Baron. 6) Remove useless initialization in xt_CT, oneliner from Yang Li. 7) Tree-wide replacement of netlink_unicast() by nfnetlink_unicast(). 8) Reduce footprint of several structures: xt_action_param, nft_pktinfo and nf_hook_state, from Florian. 10) Add nft_thoff() and nft_sk() helpers and use them, also from Florian. 11) Fix documentation in nf_tables pipapo avx2, from Florian Westphal. 12) Fix clang-12 fmt string warnings, also from Florian. ====================
Showing
- include/linux/netfilter.h 2 additions, 2 deletionsinclude/linux/netfilter.h
- include/linux/netfilter/x_tables.h 1 addition, 1 deletioninclude/linux/netfilter/x_tables.h
- include/net/netfilter/nf_tables.h 22 additions, 12 deletionsinclude/net/netfilter/nf_tables.h
- include/net/netfilter/nf_tables_core.h 31 additions, 0 deletionsinclude/net/netfilter/nf_tables_core.h
- include/net/netfilter/nf_tables_ipv4.h 18 additions, 22 deletionsinclude/net/netfilter/nf_tables_ipv4.h
- include/net/netfilter/nf_tables_ipv6.h 19 additions, 23 deletionsinclude/net/netfilter/nf_tables_ipv6.h
- include/uapi/linux/netfilter/nf_tables.h 2 additions, 0 deletionsinclude/uapi/linux/netfilter/nf_tables.h
- net/ipv4/netfilter/nft_reject_ipv4.c 1 addition, 1 deletionnet/ipv4/netfilter/nft_reject_ipv4.c
- net/ipv6/netfilter/ip6_tables.c 1 addition, 1 deletionnet/ipv6/netfilter/ip6_tables.c
- net/ipv6/netfilter/nft_reject_ipv6.c 1 addition, 1 deletionnet/ipv6/netfilter/nft_reject_ipv6.c
- net/netfilter/Kconfig 1 addition, 1 deletionnet/netfilter/Kconfig
- net/netfilter/ipset/ip_set_core.c 10 additions, 40 deletionsnet/netfilter/ipset/ip_set_core.c
- net/netfilter/ipvs/Kconfig 1 addition, 1 deletionnet/netfilter/ipvs/Kconfig
- net/netfilter/nf_conntrack_h323_main.c 1 addition, 1 deletionnet/netfilter/nf_conntrack_h323_main.c
- net/netfilter/nf_conntrack_netlink.c 18 additions, 47 deletionsnet/netfilter/nf_conntrack_netlink.c
- net/netfilter/nf_tables_core.c 1 addition, 1 deletionnet/netfilter/nf_tables_core.c
- net/netfilter/nf_tables_trace.c 3 additions, 3 deletionsnet/netfilter/nf_tables_trace.c
- net/netfilter/nfnetlink_acct.c 3 additions, 6 deletionsnet/netfilter/nfnetlink_acct.c
- net/netfilter/nfnetlink_cthelper.c 3 additions, 7 deletionsnet/netfilter/nfnetlink_cthelper.c
- net/netfilter/nfnetlink_cttimeout.c 10 additions, 24 deletionsnet/netfilter/nfnetlink_cttimeout.c
Please register or sign in to comment