projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
36432da
)
netfilter: nf_ct_tcp: fix up build after merge
author
Patrick McHardy
<kaber@trash.net>
Thu, 11 Jun 2009 14:16:09 +0000
(16:16 +0200)
committer
Patrick McHardy
<kaber@trash.net>
Thu, 11 Jun 2009 14:16:09 +0000
(16:16 +0200)
Replace the last occurence of tcp_lock by the per-conntrack lock.
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/netfilter/nf_conntrack_proto_tcp.c
patch
|
blob
|
blame
|
history
diff --git
a/net/netfilter/nf_conntrack_proto_tcp.c
b/net/netfilter/nf_conntrack_proto_tcp.c
index 5142e60af5402237642163758a4665d707438a26..33fc0a443f3de755772f5be4f686c1f44adf9cb1 100644
(file)
--- 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 ");