diff options
author | David S. Miller <davem@davemloft.net> | 2015-03-22 21:57:07 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-22 21:57:07 +0100 |
commit | c0e41fa76c5f3775c9479f6babcb94d54da08a51 (patch) | |
tree | 3c09b597056c36dc89157803a6e568b277f3072d /arch/cris | |
parent | cx82310_eth: wait for firmware to become ready (diff) | |
parent | netfilter: nft_compat: set IP6T_F_PROTO flag if protocol is set (diff) | |
download | linux-c0e41fa76c5f3775c9479f6babcb94d54da08a51.tar.xz linux-c0e41fa76c5f3775c9479f6babcb94d54da08a51.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for your net tree,
they are:
1) Fix missing initialization of tuple structure in nfnetlink_cthelper
to avoid mismatches when looking up to attach userspace helpers to
flows, from Ian Wilson.
2) Fix potential crash in nft_hash when we hit -EAGAIN in
nft_hash_walk(), from Herbert Xu.
3) We don't need to indicate the hook information to update the
basechain default policy in nf_tables.
4) Restore tracing over nfnetlink_log due to recent rework to
accomodate logging infrastructure into nf_tables.
5) Fix wrong IP6T_INV_PROTO check in xt_TPROXY.
6) Set IP6T_F_PROTO flag in nft_compat so we can use SYNPROXY6 and
REJECT6 from xt over nftables.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions