summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2020-08-04 13:32:39 -0700
committerDavid S. Miller <davem@davemloft.net>2020-08-04 13:32:39 -0700
commitee895a30ef463e3ebaa5cbe464346d9fbbce1860 (patch)
tree00755eb8853e291fb9ed57d7f33630f77cebb9ad /drivers/net
parentbab9693a9a8c6dd19f670408ec1e78e12a320682 (diff)
parent4203b19c27967d9eff6928f6a733f81892ffc592 (diff)
downloadlinux-stable-ee895a30ef463e3ebaa5cbe464346d9fbbce1860.tar.gz
linux-stable-ee895a30ef463e3ebaa5cbe464346d9fbbce1860.tar.bz2
linux-stable-ee895a30ef463e3ebaa5cbe464346d9fbbce1860.zip
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>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions