diff options
author | Jakub Kicinski | 2020-02-01 12:38:20 -0800 |
---|---|---|
committer | Jakub Kicinski | 2020-02-01 12:38:20 -0800 |
commit | b7c3a17c6062701d97a0959890a2c882bfaac537 (patch) | |
tree | c2e15837cfcf304d1ede23c0d97a5df20bfedfab /Documentation | |
parent | cb3c0e6bdf64d0d124e94ce43cbe4ccbb9b37f51 (diff) | |
parent | 78e06cf430934fc3768c342cbebdd1013dcd6fa7 (diff) |
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) Fix suspicious RCU usage in ipset, from Jozsef Kadlecsik.
2) Use kvcalloc, from Joe Perches.
3) Flush flowtable hardware workqueue after garbage collection run,
from Paul Blakey.
4) Missing flowtable hardware workqueue flush from nf_flow_table_free(),
also from Paul.
5) Restore NF_FLOW_HW_DEAD in flow_offload_work_del(), from Paul.
6) Flowtable documentation fixes, from Matteo Croce.
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/networking/nf_flowtable.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/nf_flowtable.txt b/Documentation/networking/nf_flowtable.txt index ca2136c76042..0bf32d1121be 100644 --- a/Documentation/networking/nf_flowtable.txt +++ b/Documentation/networking/nf_flowtable.txt @@ -76,7 +76,7 @@ flowtable and add one rule to your forward chain. table inet x { flowtable f { - hook ingress priority 0 devices = { eth0, eth1 }; + hook ingress priority 0; devices = { eth0, eth1 }; } chain y { type filter hook forward priority 0; policy accept; |