David S. Miller 90d0e08e57 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ... Pablo Neira Ayuso says: ==================== Netfilter/IPVS updates for net-next This small patchset contains three accumulated Netfilter/IPVS updates, they are: 1) Refactorize common NAT code by encapsulating it into a helper function, similarly to what we do in other conntrack extensions, from Florian Westphal. 2) A minor format string mismatch fix for IPVS, from Masanari Iida. 3) Add quota support to the netfilter accounting infrastructure, now you can add quotas to accounting objects via the nfnetlink interface and use them from iptables. You can also listen to quota notifications from userspace. This enhancement from Mathieu Poirier. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-30 17:54:47 -07:00
..
ip6_tables.c	netfilter: Can't fail and free after table replacement	2014-04-05 17:46:22 +02:00
ip6t_ah.c	netfilter: ip6_tables: add flags parameter to ipv6_find_hdr()	2012-05-09 12:53:47 +02:00
ip6t_eui64.c	netfilter: xtables: change hotdrop pointer to direct modification	2010-05-11 18:35:27 +02:00
ip6t_frag.c	netfilter: ip6_tables: add flags parameter to ipv6_find_hdr()	2012-05-09 12:53:47 +02:00
ip6t_hbh.c	netfilter: ip6_tables: add flags parameter to ipv6_find_hdr()	2012-05-09 12:53:47 +02:00
ip6t_ipv6header.c	netfilter: xtables: deconstify struct xt_action_param for matches	2010-05-11 18:33:37 +02:00
ip6t_MASQUERADE.c	netfilter: nf_conntrack: don't send destroy events from iterator	2013-08-09 12:03:33 +02:00
ip6t_mh.c	netfilter: xtables: change hotdrop pointer to direct modification	2010-05-11 18:35:27 +02:00
ip6t_NPT.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-07 18:37:01 -04:00
ip6t_REJECT.c	netfilter: REJECT: separate reusable code	2013-12-30 15:04:41 +01:00
ip6t_rpfilter.c	net: ipv6: more places need LOOPBACK_IFINDEX for flowi6_iif	2014-04-28 14:47:03 -04:00
ip6t_rt.c	netfilter: ip6_tables: add flags parameter to ipv6_find_hdr()	2012-05-09 12:53:47 +02:00
ip6t_SYNPROXY.c	netfilter: SYNPROXY target: restrict to INPUT/FORWARD	2013-12-11 11:30:25 +01:00
ip6table_filter.c	netfilter: pass hook ops to hookfn	2013-10-14 11:29:31 +02:00
ip6table_mangle.c	netfilter: pass hook ops to hookfn	2013-10-14 11:29:31 +02:00
ip6table_nat.c	netfilter: add helper for adding nat extension	2014-04-29 20:56:22 +02:00
ip6table_raw.c	netfilter: pass hook ops to hookfn	2013-10-14 11:29:31 +02:00
ip6table_security.c	netfilter: pass hook ops to hookfn	2013-10-14 11:29:31 +02:00
Kconfig	netfilter: nft_reject: split up reject module into IPv4 and IPv6 specifc parts	2014-02-06 09:44:10 +01:00
Makefile	netfilter: nft_reject: split up reject module into IPv4 and IPv6 specifc parts	2014-02-06 09:44:10 +01:00
nf_conntrack_l3proto_ipv6.c	netfilter: push reasm skb through instead of original frag skbs	2013-11-11 00:19:35 -05:00
nf_conntrack_proto_icmpv6.c	netfilter: nf_log: prepare net namespace support for loggers	2013-04-05 20:12:54 +02:00
nf_conntrack_reasm.c	net: rename local_df to ignore_df	2014-05-12 14:03:41 -04:00
nf_defrag_ipv6_hooks.c	netfilter: push reasm skb through instead of original frag skbs	2013-11-11 00:19:35 -05:00
nf_nat_l3proto_ipv6.c	netfilter: ipv6: using csum_ipv6_magic requires net/ip6_checksum.h	2012-09-05 17:46:06 -04:00
nf_nat_proto_icmpv6.c	netfilter: nf_nat_proto_icmpv6:: fix wrong comparison in icmpv6_manip_pkt	2013-09-13 11:58:48 +02:00
nf_tables_ipv6.c	netfilter: nf_tables: fix error path in the init functions	2014-01-09 23:25:48 +01:00
nft_chain_nat_ipv6.c	netfilter: add helper for adding nat extension	2014-04-29 20:56:22 +02:00
nft_chain_route_ipv6.c	netfilter: nf_tables: rename nft_do_chain_pktinfo() to nft_do_chain()	2014-01-09 20:17:16 +01:00
nft_reject_ipv6.c	netfilter: nf_tables: add reject module for NFPROTO_INET	2014-02-06 09:44:18 +01:00