diff options
author | David S. Miller <davem@davemloft.net> | 2014-09-03 00:56:30 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-03 00:56:30 +0400 |
commit | abccc5878a31bc921e9b1e254c74ea20761f4c4b (patch) | |
tree | 5f3c42549b5a323ea4a3f5c6c074dc410e5359d1 /net/ipv6/xfrm6_state.c | |
parent | 04860eb7d911bbd958463416cc045b69ffdf73b3 (diff) | |
parent | d79a61d646db950b68dd79ecc627cb5f11e0d8ac (diff) | |
download | linux-abccc5878a31bc921e9b1e254c74ea20761f4c4b.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
pull request: Netfilter/IPVS fixes for net
The following patchset contains seven Netfilter fixes for your net
tree, they are:
1) Make the NAT infrastructure independent of x_tables, some users are
already starting to test nf_tables with NAT without enabling x_tables.
Without this patch for Kconfig, there's a superfluous dependency
between NAT and x_tables.
2) Allow to use 0 in the cgroup match, the kernel rejects with -EINVAL
with no good reason. From Daniel Borkmann.
3) Select CONFIG_NF_NAT from the nf_tables NAT expression, this also
resolves another NAT dependency with x_tables.
4) Use HAVE_JUMP_LABEL instead of CONFIG_JUMP_LABEL in the Netfilter hook
code as elsewhere in the kernel to resolve toolchain problems, from
Zhouyi Zhou.
5) Use iptunnel_handle_offloads() to set up tunnel encapsulation
depending on the offload capabilities, reported by Alex Gartrell
patch from Julian Anastasov.
6) Fix wrong family when registering the ip_vs_local_reply6() hook,
also from Julian.
7) Select the NF_LOG_* symbols from NETFILTER_XT_TARGET_LOG. Rafał
Miłecki reported that when jumping from 3.16 to 3.17-rc, his log
target is not selected anymore due to changes in the previous
development cycle to accomodate the full logging support for
nf_tables.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_state.c')
0 files changed, 0 insertions, 0 deletions