Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says: ==================== Netfilter/IPVS updates for net-next 1) Remove indirection and use nf_ct_get() instead from nfnetlink_log and nfnetlink_queue, from Florian Westphal. 2) Add weighted random twos choice least-connection scheduling for IPVS, from Darby Payne. 3) Add a __hash placeholder in the flow tuple structure to identify the field to be included in the rhashtable key hash calculation. 4) Add a new nft_parse_register_load() and nft_parse_register_store() to consolidate register load and store in the core. 5) Statify nft_parse_register() since it has no more module clients. 6) Remove redundant assignment in nft_cmp, from Colin Ian King. * git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next: netfilter: nftables: remove redundant assignment of variable err netfilter: nftables: statify nft_parse_register() netfilter: nftables: add nft_parse_register_store() and use it netfilter: nftables: add nft_parse_register_load() and use it netfilter: flowtable: add hash offset field to tuple ipvs: add weighted random twos choice algorithm netfilter: ctnetlink: remove get_ct indirection ==================== Link: https://lore.kernel.org/r/20210206015005.23037-1-pablo@netfilter.org Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Showing
- include/linux/netfilter.h 0 additions, 2 deletionsinclude/linux/netfilter.h
- include/net/netfilter/nf_flow_table.h 4 additions, 0 deletionsinclude/net/netfilter/nf_flow_table.h
- include/net/netfilter/nf_tables.h 5 additions, 6 deletionsinclude/net/netfilter/nf_tables.h
- include/net/netfilter/nf_tables_core.h 6 additions, 6 deletionsinclude/net/netfilter/nf_tables_core.h
- include/net/netfilter/nft_fib.h 1 addition, 1 deletioninclude/net/netfilter/nft_fib.h
- include/net/netfilter/nft_meta.h 2 additions, 2 deletionsinclude/net/netfilter/nft_meta.h
- net/bridge/netfilter/nft_meta_bridge.c 2 additions, 3 deletionsnet/bridge/netfilter/nft_meta_bridge.c
- net/ipv4/netfilter/nft_dup_ipv4.c 9 additions, 9 deletionsnet/ipv4/netfilter/nft_dup_ipv4.c
- net/ipv6/netfilter/nft_dup_ipv6.c 9 additions, 9 deletionsnet/ipv6/netfilter/nft_dup_ipv6.c
- net/netfilter/ipvs/Kconfig 11 additions, 0 deletionsnet/netfilter/ipvs/Kconfig
- net/netfilter/ipvs/Makefile 1 addition, 0 deletionsnet/netfilter/ipvs/Makefile
- net/netfilter/ipvs/ip_vs_twos.c 139 additions, 0 deletionsnet/netfilter/ipvs/ip_vs_twos.c
- net/netfilter/nf_conntrack_netlink.c 0 additions, 7 deletionsnet/netfilter/nf_conntrack_netlink.c
- net/netfilter/nf_flow_table_core.c 3 additions, 3 deletionsnet/netfilter/nf_flow_table_core.c
- net/netfilter/nf_tables_api.c 46 additions, 9 deletionsnet/netfilter/nf_tables_api.c
- net/netfilter/nfnetlink_log.c 7 additions, 1 deletionnet/netfilter/nfnetlink_log.c
- net/netfilter/nfnetlink_queue.c 8 additions, 2 deletionsnet/netfilter/nfnetlink_queue.c
- net/netfilter/nft_bitwise.c 11 additions, 12 deletionsnet/netfilter/nft_bitwise.c
- net/netfilter/nft_byteorder.c 7 additions, 7 deletionsnet/netfilter/nft_byteorder.c
- net/netfilter/nft_cmp.c 4 additions, 8 deletionsnet/netfilter/nft_cmp.c
Please register or sign in to comment