From: Jesper Dangaard Brouer Date: Mon, 3 Mar 2014 13:46:01 +0000 (+0100) Subject: netfilter: conntrack: seperate expect locking from nf_conntrack_lock X-Git-Tag: v3.15-rc1~113^2~144^2~15 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca7433df3a672efc88e08222cfa4b3aa965ca324;p=pandora-kernel.git 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 Signed-off-by: David S. Miller Reviewed-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso --- Reading git-diff-tree failed