Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
The following patchset contains a small batch of Netfilter
updates for your net-next tree, they are:
* Three patches that provide more accurate error reporting to
user-space, instead of -EPERM, in IPv4/IPv6 netfilter re-routing
code and NAT, from Patrick McHardy.
* Update copyright statements in Netfilter filters of
Patrick McHardy, from himself.
* Add Kconfig dependency on the raw/mangle tables to the
rpfilter, from Florian Westphal.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- net/ipv4/netfilter.c 10 additions, 5 deletionsnet/ipv4/netfilter.c
- net/ipv4/netfilter/Kconfig 1 addition, 1 deletionnet/ipv4/netfilter/Kconfig
- net/ipv4/netfilter/arp_tables.c 1 addition, 0 deletionsnet/ipv4/netfilter/arp_tables.c
- net/ipv4/netfilter/ip_tables.c 1 addition, 0 deletionsnet/ipv4/netfilter/ip_tables.c
- net/ipv4/netfilter/ipt_ULOG.c 1 addition, 0 deletionsnet/ipv4/netfilter/ipt_ULOG.c
- net/ipv4/netfilter/iptable_mangle.c 6 additions, 3 deletionsnet/ipv4/netfilter/iptable_mangle.c
- net/ipv4/netfilter/iptable_nat.c 15 additions, 8 deletionsnet/ipv4/netfilter/iptable_nat.c
- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 1 addition, 0 deletionsnet/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c 1 addition, 0 deletionsnet/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
- net/ipv4/netfilter/nf_conntrack_proto_icmp.c 1 addition, 0 deletionsnet/ipv4/netfilter/nf_conntrack_proto_icmp.c
- net/ipv4/netfilter/nf_nat_h323.c 1 addition, 0 deletionsnet/ipv4/netfilter/nf_nat_h323.c
- net/ipv4/netfilter/nf_nat_pptp.c 2 additions, 0 deletionsnet/ipv4/netfilter/nf_nat_pptp.c
- net/ipv4/netfilter/nf_nat_proto_gre.c 2 additions, 0 deletionsnet/ipv4/netfilter/nf_nat_proto_gre.c
- net/ipv4/netfilter/nf_nat_snmp_basic.c 2 additions, 0 deletionsnet/ipv4/netfilter/nf_nat_snmp_basic.c
- net/ipv6/netfilter.c 9 additions, 3 deletionsnet/ipv6/netfilter.c
- net/ipv6/netfilter/Kconfig 1 addition, 1 deletionnet/ipv6/netfilter/Kconfig
- net/ipv6/netfilter/ip6_tables.c 1 addition, 0 deletionsnet/ipv6/netfilter/ip6_tables.c
- net/ipv6/netfilter/ip6t_REJECT.c 2 additions, 0 deletionsnet/ipv6/netfilter/ip6t_REJECT.c
- net/ipv6/netfilter/ip6table_mangle.c 6 additions, 3 deletionsnet/ipv6/netfilter/ip6table_mangle.c
- net/ipv6/netfilter/ip6table_nat.c 15 additions, 8 deletionsnet/ipv6/netfilter/ip6table_nat.c
Loading
Please register or sign in to comment