From 6d721364e4f7e3c3d3f07184cb7f88727db68071 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Tue, 27 Apr 2010 06:22:01 +0000
Subject: [PATCH] --- yaml --- r: 194535 b: refs/heads/master c:
 7ec75c582e639d956ce3afd499f67febe6f902a4 h: refs/heads/master i:   194533:
 77e4e5402670960a83f4da0b35749a59ed9311ca   194531:
 165d79f831abb6267981ba191639c66a5ce9a742   194527:
 707fe74a628a8dad43ed281c5bdc40a0d12558c1 v: v3

---
 [refs]                                 | 2 +-
 trunk/include/net/inet_timewait_sock.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d49d4af33a47..6c769b450bbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4c4f07df16c767b8efbc44e7cdf795fac326b33
+refs/heads/master: 7ec75c582e639d956ce3afd499f67febe6f902a4
diff --git a/trunk/include/net/inet_timewait_sock.h b/trunk/include/net/inet_timewait_sock.h
index 79f67eae8a7e..a066fdd50da6 100644
--- a/trunk/include/net/inet_timewait_sock.h
+++ b/trunk/include/net/inet_timewait_sock.h
@@ -224,7 +224,9 @@ static inline
 struct net *twsk_net(const struct inet_timewait_sock *twsk)
 {
 #ifdef CONFIG_NET_NS
-	return rcu_dereference(twsk->tw_net);
+	return rcu_dereference_raw(twsk->tw_net); /* protected by locking, */
+						  /* reference counting, */
+						  /* initialization, or RCU. */
 #else
 	return &init_net;
 #endif