From 428fb64e03196ca25942f42ca21ec7236bbaf3a6 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 29 Jun 2012 05:23:25 +0000
Subject: [PATCH] --- yaml --- r: 315019 b: refs/heads/master c:
 be0593c678249cbb32c6096a705f05a9834e257d h: refs/heads/master i:   315017:
 1c0098b33ccad1d1d1cc969aa9031c46bd8312b2   315015:
 6d77fa85369632baa04693c8d455036dab1570a6 v: v3

---
 [refs]                                       | 2 +-
 trunk/net/netfilter/nf_conntrack_proto_tcp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f90059217a5d..3353845dc88e 100644
--- 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
index 07e56ea2e9bf..a5ac11ebef33 100644
--- 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. */