diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-08-04 13:32:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-04 13:32:39 -0700 |
| commit | ee895a30ef463e3ebaa5cbe464346d9fbbce1860 (patch) | |
| tree | 00755eb8853e291fb9ed57d7f33630f77cebb9ad /drivers/net/ethernet/cadence/macb_main.c | |
| parent | net: thunderx: use spin_lock_bh in nicvf_set_rx_mode_task() (diff) | |
| parent | netfilter: flowtable: Set offload timeout when adding flow (diff) | |
| download | linux-dev-ee895a30ef463e3ebaa5cbe464346d9fbbce1860.tar.xz linux-dev-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/ethernet/cadence/macb_main.c')
0 files changed, 0 insertions, 0 deletions