diff options
author | David S. Miller <davem@davemloft.net> | 2019-07-08 12:13:38 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-07-08 12:13:38 -0700 |
commit | 47cfb90406e1d8de4007e781155884ff10bb40d3 (patch) | |
tree | bff43ffd983233d08edc09243df7759e3ff15d61 /include/crypto/hash.h | |
parent | bfb204129a5adeb8eb62d693e97047ae6c8f37fd (diff) | |
parent | 0ef1efd1354d732d040f29b2005420f83fcdd8f4 (diff) | |
download | linux-47cfb90406e1d8de4007e781155884ff10bb40d3.tar.bz2 |
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/IPVS updates for net-next:
1) Move bridge keys in nft_meta to nft_meta_bridge, from wenxu.
2) Support for bridge pvid matching, from wenxu.
3) Support for bridge vlan protocol matching, also from wenxu.
4) Add br_vlan_get_pvid_rcu(), to fetch the bridge port pvid
from packet path.
5) Prefer specific family extension in nf_tables.
6) Autoload specific family extension in case it is missing.
7) Add synproxy support to nf_tables, from Fernando Fernandez Mancera.
8) Support for GRE encapsulation in IPVS, from Vadim Fedorenko.
9) ICMP handling for GRE encapsulation, from Julian Anastasov.
10) Remove unused parameter in nf_queue, from Florian Westphal.
11) Replace seq_printf() by seq_puts() in nf_log, from Markus Elfring.
12) Rename nf_SYNPROXY.h => nf_synproxy.h before this header becomes
public.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/crypto/hash.h')
0 files changed, 0 insertions, 0 deletions