diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-26 22:31:42 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-26 22:31:42 +0300 |
| commit | eb43c081a6df85e3119226b932ddb9a9572b26e4 (patch) | |
| tree | fea62c0d996834447b49ff9bfbe98a0dde59187e /net/netfilter/nf_log_syslog.c | |
| parent | 6876a18d3361e1893187970e1881a1d88d894d3f (diff) | |
| parent | 47a6959fa331fe892a4fc3b48ca08e92045c6bda (diff) | |
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 net-next:
1) The various ip(6)table_foo incarnations are updated to expect
that the table is passed as 'void *priv' argument that netfilter core
passes to the hook functions. This reduces the struct net size by 2
cachelines on x86_64. From Florian Westphal.
2) Add cgroupsv2 support for nftables.
3) Fix bridge log family merge into nf_log_syslog: Missing
unregistration from netns exit path, from Phil Sutter.
4) Add nft_pernet() helper to access nftables pernet area.
5) Add struct nfnl_info to reduce nfnetlink callback footprint and
to facilite future updates. Consolidate nfnetlink callbacks.
6) Add CONFIG_NETFILTER_XTABLES_COMPAT Kconfig knob, also from Florian.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_log_syslog.c')
| -rw-r--r-- | net/netfilter/nf_log_syslog.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_log_syslog.c b/net/netfilter/nf_log_syslog.c index 2518818ed479..13234641cdb3 100644 --- a/net/netfilter/nf_log_syslog.c +++ b/net/netfilter/nf_log_syslog.c @@ -1011,6 +1011,7 @@ static void __net_exit nf_log_syslog_net_exit(struct net *net) nf_log_unset(net, &nf_arp_logger); nf_log_unset(net, &nf_ip6_logger); nf_log_unset(net, &nf_netdev_logger); + nf_log_unset(net, &nf_bridge_logger); } static struct pernet_operations nf_log_syslog_net_ops = { |