diff options
| author | Florian Westphal <fw@strlen.de> | 2016-04-18 16:16:59 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-04-25 14:52:11 +0200 |
| commit | a3efd81205b128a802025abb689925177a4607ed (patch) | |
| tree | d6d50add5d335713ea565385243136919ef539a8 /include/net/netns | |
| parent | 15cfd40771e18a4e9b788c64c9db2606f958b93d (diff) | |
| download | blackbird-op-linux-a3efd81205b128a802025abb689925177a4607ed.tar.gz blackbird-op-linux-a3efd81205b128a802025abb689925177a4607ed.zip | |
netfilter: conntrack: move generation seqcnt out of netns_ct
We only allow rehash in init namespace, so we only use
init_ns.generation. And even if we would allow it, it makes no sense
as the conntrack locks are global; any ongoing rehash prevents insert/
delete.
So make this private to nf_conntrack_core instead.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net/netns')
| -rw-r--r-- | include/net/netns/conntrack.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h index 723b61c82b3f..b052785b1590 100644 --- a/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h @@ -94,7 +94,6 @@ struct netns_ct { int sysctl_checksum; unsigned int htable_size; - seqcount_t generation; struct kmem_cache *nf_conntrack_cachep; struct hlist_nulls_head *hash; struct hlist_head *expect_hash; |
