Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following batch contains Netfilter updates for net-next:
1) Split flowtable workqueues per events, from Oz Shlomo.
2) fall-through warnings for clang, from Gustavo A. R. Silva
3) Remove unused declaration in conntrack, from YueHaibing.
4) Consolidate skb_try_make_writable() in flowtable datapath,
simplify some of the existing codebase.
5) Call dst_check() to fall back to static classic forwarding path.
6) Update table flags from commit phase.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- include/net/netfilter/ipv6/nf_conntrack_ipv6.h 0 additions, 3 deletionsinclude/net/netfilter/ipv6/nf_conntrack_ipv6.h
- include/net/netfilter/nf_flow_table.h 7 additions, 7 deletionsinclude/net/netfilter/nf_flow_table.h
- include/net/netfilter/nf_tables.h 6 additions, 3 deletionsinclude/net/netfilter/nf_tables.h
- net/netfilter/nf_conntrack_proto_dccp.c 1 addition, 0 deletionsnet/netfilter/nf_conntrack_proto_dccp.c
- net/netfilter/nf_flow_table_core.c 16 additions, 41 deletionsnet/netfilter/nf_flow_table_core.c
- net/netfilter/nf_flow_table_ip.c 90 additions, 141 deletionsnet/netfilter/nf_flow_table_ip.c
- net/netfilter/nf_flow_table_offload.c 36 additions, 8 deletionsnet/netfilter/nf_flow_table_offload.c
- net/netfilter/nf_tables_api.c 17 additions, 15 deletionsnet/netfilter/nf_tables_api.c
- net/netfilter/nft_ct.c 1 addition, 0 deletionsnet/netfilter/nft_ct.c
Please register or sign in to comment