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) Use nfnetlink_unicast() instead of netlink_unicast() in nft_compat.
2) Remove call to nf_ct_l4proto_find() in flowtable offload timeout
fixup.
3) CLUSTERIP registers ARP hook on demand, from Florian.
4) Use clusterip_net to store pernet warning, also from Florian.
5) Remove struct netns_xt, from Florian Westphal.
6) Enable ebtables hooks in initns on demand, from Florian.
7) Allow to filter conntrack netlink dump per status bits,
from Florian Westphal.
8) Register x_tables hooks in initns on demand, from Florian.
9) Remove queue_handler from per-netns structure, again from Florian.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- include/linux/netfilter/x_tables.h 3 additions, 3 deletionsinclude/linux/netfilter/x_tables.h
- include/linux/netfilter_bridge/ebtables.h 2 additions, 0 deletionsinclude/linux/netfilter_bridge/ebtables.h
- include/net/net_namespace.h 0 additions, 2 deletionsinclude/net/net_namespace.h
- include/net/netfilter/nf_queue.h 2 additions, 2 deletionsinclude/net/netfilter/nf_queue.h
- include/net/netns/netfilter.h 0 additions, 1 deletioninclude/net/netns/netfilter.h
- include/net/netns/x_tables.h 0 additions, 12 deletionsinclude/net/netns/x_tables.h
- include/uapi/linux/netfilter/nfnetlink_conntrack.h 1 addition, 0 deletionsinclude/uapi/linux/netfilter/nfnetlink_conntrack.h
- net/bridge/netfilter/ebtable_broute.c 14 additions, 3 deletionsnet/bridge/netfilter/ebtable_broute.c
- net/bridge/netfilter/ebtable_filter.c 14 additions, 3 deletionsnet/bridge/netfilter/ebtable_filter.c
- net/bridge/netfilter/ebtable_nat.c 14 additions, 3 deletionsnet/bridge/netfilter/ebtable_nat.c
- net/bridge/netfilter/ebtables.c 95 additions, 14 deletionsnet/bridge/netfilter/ebtables.c
- net/ipv4/netfilter/arptable_filter.c 11 additions, 12 deletionsnet/ipv4/netfilter/arptable_filter.c
- net/ipv4/netfilter/ipt_CLUSTERIP.c 37 additions, 19 deletionsnet/ipv4/netfilter/ipt_CLUSTERIP.c
- net/ipv4/netfilter/iptable_filter.c 16 additions, 8 deletionsnet/ipv4/netfilter/iptable_filter.c
- net/ipv4/netfilter/iptable_mangle.c 6 additions, 11 deletionsnet/ipv4/netfilter/iptable_mangle.c
- net/ipv4/netfilter/iptable_nat.c 11 additions, 9 deletionsnet/ipv4/netfilter/iptable_nat.c
- net/ipv4/netfilter/iptable_raw.c 10 additions, 11 deletionsnet/ipv4/netfilter/iptable_raw.c
- net/ipv4/netfilter/iptable_security.c 11 additions, 12 deletionsnet/ipv4/netfilter/iptable_security.c
- net/ipv6/netfilter/ip6table_filter.c 15 additions, 8 deletionsnet/ipv6/netfilter/ip6table_filter.c
- net/ipv6/netfilter/ip6table_mangle.c 11 additions, 11 deletionsnet/ipv6/netfilter/ip6table_mangle.c
Loading
Please register or sign in to comment