netfilter: nf_conntrack: use per-conntrack locks for protocol data

[net-next-2.6.git] / net / netfilter / nf_conntrack_core.c

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index b54c23475e944481588865ed67d9039fc45f2867..edf95695e0aac511f54184b2d18dd0383d68ebbc 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -519,6 +519,7 @@ struct nf_conn *nf_conntrack_alloc(struct net *net,
                return ERR_PTR(-ENOMEM);
        }
 
+       spin_lock_init(&ct->lock);
        atomic_set(&ct->ct_general.use, 1);
        ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple = *orig;
        ct->tuplehash[IP_CT_DIR_REPLY].tuple = *repl;