]> git.karo-electronics.de Git - karo-tx-linux.git/commit
netfilter: conntrack: seperate expect locking from nf_conntrack_lock
authorJesper Dangaard Brouer <brouer@redhat.com>
Mon, 3 Mar 2014 13:46:01 +0000 (14:46 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 7 Mar 2014 10:41:01 +0000 (11:41 +0100)
commitca7433df3a672efc88e08222cfa4b3aa965ca324
treefa88e7bec5578690bb19effe9ee4f88fe82011ac
parente1b207dac13ddb2f8ddebc7dc9729a97421909bd
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>
include/net/netfilter/nf_conntrack_core.h
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_expect.c
net/netfilter/nf_conntrack_h323_main.c
net/netfilter/nf_conntrack_helper.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_conntrack_sip.c