From: Patrick McHardy <kaber@trash.net>
Date: Thu, 11 Jun 2009 14:16:09 +0000 (+0200)
Subject: netfilter: nf_ct_tcp: fix up build after merge
X-Git-Tag: upstream/snapshot3+hdmi~18292^2~109^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=334a47f6345560af047f164c356d71c3226965d5;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

netfilter: nf_ct_tcp: fix up build after merge

Replace the last occurence of tcp_lock by the per-conntrack lock.

Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 5142e60..33fc0a4 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -944,7 +944,7 @@ static int tcp_packet(struct nf_conn *ct,
 		    && (ct->proto.tcp.seen[!dir].flags & IP_CT_TCP_FLAG_MAXACK_SET)
 		    && before(ntohl(th->seq), ct->proto.tcp.seen[!dir].td_maxack)) {
 			/* Invalid RST  */
-			write_unlock_bh(&tcp_lock);
+			spin_unlock_bh(&ct->lock);
 			if (LOG_INVALID(net, IPPROTO_TCP))
 				nf_log_packet(pf, 0, skb, NULL, NULL, NULL,
 					  "nf_ct_tcp: invalid RST ");