diff options
author | David S. Miller <davem@davemloft.net> | 2018-06-03 08:24:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-06-03 08:24:27 -0400 |
commit | 4cb160d0a63bb16718fc25c52fe51fe416a1f09e (patch) | |
tree | 5298d1333c969020c364831d20035ce9cc79070d /net/ipv6/udp.c | |
parent | 1ffdd8e1643f6ce28792edd3314be84167faabf1 (diff) | |
parent | 1b2470e59fb1e983a3655feba30cdfc03e609d51 (diff) | |
download | linux-4cb160d0a63bb16718fc25c52fe51fe416a1f09e.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following patchset contains Netfilter updates for your net-next tree:
1) Get rid of nf_sk_is_transparent(), use inet_sk_transparent() instead.
From Máté Eckl.
2) Move shared tproxy infrastructure to nf_tproxy_ipv4 and nf_tproxy_ipv6.
Also from Máté.
3) Add hashtable to speed up chain lookups by name, from Florian Westphal.
4) Patch series to add connlimit support reusing part of the
nf_conncount infrastructure. This includes preparation changes such
passing context to the object and expression destroy interface;
garbage collection for expressions embedded into set elements, and
the introduction of the clone_destroy interface for expressions.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp.c')
0 files changed, 0 insertions, 0 deletions