---

yaml --- r: 315019 b: refs/heads/master c: be0593c h: refs/heads/master i: 315017: 1c0098b 315015: 6d77fa8 v: v3
git-mirror · Jul 4, 2012 · 428fb64 · 428fb64
1 parent 1dbfc03
commit 428fb64
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08911475d1d0921401e37d83292b217e1411d10b
+refs/heads/master: be0593c678249cbb32c6096a705f05a9834e257d
diff --git a/trunk/net/netfilter/nf_conntrack_proto_tcp.c b/trunk/net/netfilter/nf_conntrack_proto_tcp.c
@@ -821,7 +821,7 @@ static int tcp_error(struct net *net, struct nf_conn *tmpl,
 
 static unsigned int *tcp_get_timeouts(struct net *net)
 {
-	return tcp_timeouts;
+	return tcp_pernet(net)->timeouts;
 }
 
 /* Returns verdict for packet, or -1 for invalid. */