diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-14 13:15:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-14 13:15:02 -0700 |
| commit | 1b54f4fa4dec26a0d3b885176ecc8d6d3ca7fd95 (patch) | |
| tree | a754dc697e0fe208021135d1764587a6cbdf7642 /include/net | |
| parent | c9e2053d4b1c634064bd3160689fe4ed52978d31 (diff) | |
| parent | 340eaff651160234bdbce07ef34b92a8e45cd540 (diff) | |
| download | linux-1b54f4fa4dec26a0d3b885176ecc8d6d3ca7fd95.tar.gz linux-1b54f4fa4dec26a0d3b885176ecc8d6d3ca7fd95.tar.bz2 linux-1b54f4fa4dec26a0d3b885176ecc8d6d3ca7fd95.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) Fix gcc-10 compilation warning in nf_conntrack, from Arnd Bergmann.
2) Add NF_FLOW_HW_PENDING to avoid races between stats and deletion
commands, from Paul Blakey.
3) Remove WQ_MEM_RECLAIM from the offload workqueue, from Roi Dayan.
4) Infinite loop when removing nf_conntrack module, from Florian Westphal.
5) Set NF_FLOW_TEARDOWN bit on expiration to avoid races when refreshing
the timeout from the software path.
6) Missing nft_set_elem_expired() check in the rbtree, from Phil Sutter.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 2 | ||||
| -rw-r--r-- | include/net/netfilter/nf_flow_table.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index 9f551f3b69c6..90690e37a56f 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -87,7 +87,7 @@ struct nf_conn { struct hlist_node nat_bysource; #endif /* all members below initialized via memset */ - u8 __nfct_init_offset[0]; + struct { } __nfct_init_offset; /* If we were expected by an expectation, this will be it */ struct nf_conn *master; diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h index 6bf69652f57d..c54a7f707e50 100644 --- a/include/net/netfilter/nf_flow_table.h +++ b/include/net/netfilter/nf_flow_table.h @@ -127,6 +127,7 @@ enum nf_flow_flags { NF_FLOW_HW_DYING, NF_FLOW_HW_DEAD, NF_FLOW_HW_REFRESH, + NF_FLOW_HW_PENDING, }; enum flow_offload_type { |