diff options
author | David S. Miller <davem@davemloft.net> | 2016-03-08 20:25:20 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-03-08 20:25:20 +0100 |
commit | 4c38cd61aef20fce34c669caa901634ca5f88bf8 (patch) | |
tree | 67df223fbeb6b8ec4639f1237db947c647015809 /drivers/scsi/nsp32.h | |
parent | Merge branch 'bpf-next' (diff) | |
parent | netfilter: nft_masq: support port range (diff) | |
download | linux-4c38cd61aef20fce34c669caa901634ca5f88bf8.tar.xz linux-4c38cd61aef20fce34c669caa901634ca5f88bf8.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter/IPVS updates for net-next
The following patchset contains Netfilter updates for your net-next tree,
they are:
1) Remove useless debug message when deleting IPVS service, from
Yannick Brosseau.
2) Get rid of compilation warning when CONFIG_PROC_FS is unset in
several spots of the IPVS code, from Arnd Bergmann.
3) Add prandom_u32 support to nft_meta, from Florian Westphal.
4) Remove unused variable in xt_osf, from Sudip Mukherjee.
5) Don't calculate IP checksum twice from netfilter ipv4 defrag hook
since fixing af_packet defragmentation issues, from Joe Stringer.
6) On-demand hook registration for iptables from netns. Instead of
registering the hooks for every available netns whenever we need
one of the support tables, we register this on the specific netns
that needs it, patchset from Florian Westphal.
7) Add missing port range selection to nf_tables masquerading support.
BTW, just for the record, there is a typo in the description of
5f6c253ebe93b0 ("netfilter: bridge: register hooks only when bridge
interface is added") that refers to the cluster match as deprecated, but
it is actually the CLUSTERIP target (which registers hooks
inconditionally) the one that is scheduled for removal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/nsp32.h')
0 files changed, 0 insertions, 0 deletions