]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Tue, 4 Aug 2020 20:32:39 +0000 (13:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 4 Aug 2020 20:32:39 +0000 (13:32 -0700)
commitd844a20f1bcc570a1c808b650a26d16983e1dc1b
tree00755eb8853e291fb9ed57d7f33630f77cebb9ad
parent5677aab99671e9834305e74c94c5aea958d615cd
parentc13e092e4b048525907b491f91fcfbd586f36bb6
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 net:

1) Flush the cleanup xtables worker to make sure destructors
   have completed, from Florian Westphal.

2) iifgroup is matching erroneously, also from Florian.

3) Add selftest for meta interface matching, from Florian Westphal.

4) Move nf_ct_offload_timeout() to header, from Roi Dayan.

5) Call nf_ct_offload_timeout() from flow_offload_add() to
   make sure garbage collection does not evict offloaded flow,
   from Roi Dayan.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/netfilter/nf_tables.h
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_tables_api.c