diff options
| author |   Jesper Dangaard Brouer <brouer@redhat.com> | 2014-03-03 14:46:01 +0100 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2014-03-07 11:41:01 +0100 |
| commit | ca7433df3a672efc88e08222cfa4b3aa965ca324 (patch) | |
| tree | fa88e7bec5578690bb19effe9ee4f88fe82011ac /include/net/netfilter/nf_conntrack_core.h | |
| parent | netfilter: avoid race with exp->master ct (diff) | |
| download | linux-dev-ca7433df3a672efc88e08222cfa4b3aa965ca324.tar.xz linux-dev-ca7433df3a672efc88e08222cfa4b3aa965ca324.zip | |
netfilter: conntrack: seperate expect locking from nf_conntrack_lock
Netfilter expectations are protected with the same lock as conntrack
entries (nf_conntrack_lock). This patch split out expectations locking
to use it's own lock (nf_conntrack_expect_lock).
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Reviewed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net/netfilter/nf_conntrack_core.h')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h index 15308b8eb5b5..d12a631d0415 100644 --- a/include/net/netfilter/nf_conntrack_core.h +++ b/include/net/netfilter/nf_conntrack_core.h @@ -79,4 +79,6 @@ print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple, extern spinlock_t nf_conntrack_lock ; +extern spinlock_t nf_conntrack_expect_lock; + #endif /* _NF_CONNTRACK_CORE_H */ |