diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-01-20 18:56:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-20 18:56:44 -0800 |
| commit | 8034e1efcb330d2aecef8cbf8a83f206270c1775 (patch) | |
| tree | 92d9883ddf4a918b17eb8ed0fb0d64c45ebd5ea1 /include/net | |
| parent | net: change tcp_syn_retries documentation (diff) | |
| parent | netfilter: nf_conntrack: use safer way to lock all buckets (diff) | |
| download | linux-dev-8034e1efcb330d2aecef8cbf8a83f206270c1775.tar.xz linux-dev-8034e1efcb330d2aecef8cbf8a83f206270c1775.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_core.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h index 788ef58a66b9..62e17d1319ff 100644 --- a/include/net/netfilter/nf_conntrack_core.h +++ b/include/net/netfilter/nf_conntrack_core.h @@ -79,12 +79,10 @@ print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple, const struct nf_conntrack_l3proto *l3proto, const struct nf_conntrack_l4proto *proto); -#ifdef CONFIG_LOCKDEP -# define CONNTRACK_LOCKS 8 -#else -# define CONNTRACK_LOCKS 1024 -#endif +#define CONNTRACK_LOCKS 1024 + extern spinlock_t nf_conntrack_locks[CONNTRACK_LOCKS]; +void nf_conntrack_lock(spinlock_t *lock); extern spinlock_t nf_conntrack_expect_lock; |