summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-01-21 05:56:44 +0300
committerDavid S. Miller <davem@davemloft.net>2016-01-21 05:56:44 +0300
commit8034e1efcb330d2aecef8cbf8a83f206270c1775 (patch)
tree92d9883ddf4a918b17eb8ed0fb0d64c45ebd5ea1 /include/net
parentbffae6975e00b78e86bcd694ab4c8c48216572a3 (diff)
parentb16c29191dc89bd877af99a7b04ce4866728a3e0 (diff)
downloadlinux-8034e1efcb330d2aecef8cbf8a83f206270c1775.tar.xz
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.h8
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;