diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-21 19:26:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-21 19:26:17 -0700 |
| commit | 36a28b21169d28db2a3409a4e2d4b9a7563c1a00 (patch) | |
| tree | 33174b0738bef888532544e91fd115204edf14e3 /net/ipv6 | |
| parent | e53567948f82368247b4b1a63fcab4c76ef7d51c (diff) | |
| parent | 00db674bedd68ff8b5afae9030ff5e04d45d1b4a (diff) | |
| download | op-kernel-dev-36a28b21169d28db2a3409a4e2d4b9a7563c1a00.zip op-kernel-dev-36a28b21169d28db2a3409a4e2d4b9a7563c1a00.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains four Netfilter fixes for net, they are:
1) Fix Kconfig dependencies of new nf_dup_ipv4 and nf_dup_ipv6.
2) Remove bogus test nh_scope in IPv4 rpfilter match that is breaking
--accept-local, from Xin Long.
3) Wait for RCU grace period after dropping the pending packets in the
nfqueue, from Florian Westphal.
4) Fix sleeping allocation while holding spin_lock_bh, from Nikolay Borisov.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index 96833e4..f6a024e 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig @@ -58,6 +58,7 @@ endif # NF_TABLES config NF_DUP_IPV6 tristate "Netfilter IPv6 packet duplication to alternate destination" + depends on !NF_CONNTRACK || NF_CONNTRACK help This option enables the nf_dup_ipv6 core, which duplicates an IPv6 packet to be rerouted to another destination. |
