---

yaml --- r: 194535 b: refs/heads/master c: 7ec75c5 h: refs/heads/master i: 194533: 77e4e54 194531: 165d79f 194527: 707fe74 v: v3
git-mirror · Apr 27, 2010 · 6d72136 · 6d72136
1 parent 9b02436
commit 6d72136
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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