From bc90fe406156e489410e9050c19a72b376ebdff7 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <mita@miraclelinux.com>
Date: Fri, 28 Apr 2006 15:21:23 -0700
Subject: [PATCH] --- yaml --- r: 26371 b: refs/heads/master c:
 da753beaeb1446aa87bcca7e8a0026633a8914f0 h: refs/heads/master i:   26369:
 b0ba5b2b0ae928eeded809fae26cd497cf3661f9   26367:
 a2574cb326a2eb69c3d2906ac090916822984c21 v: v3

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

diff --git a/[refs] b/[refs]
index dd5c5e3aefb2..d5c4fe71217e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a536e0778781c1f2ce38cf8e1d82ce258f0193c1
+refs/heads/master: da753beaeb1446aa87bcca7e8a0026633a8914f0
diff --git a/trunk/include/linux/list.h b/trunk/include/linux/list.h
index 67258b47e9ca..76f05718342c 100644
--- a/trunk/include/linux/list.h
+++ b/trunk/include/linux/list.h
@@ -619,7 +619,7 @@ static inline void hlist_del_rcu(struct hlist_node *n)
 
 static inline void hlist_del_init(struct hlist_node *n)
 {
-	if (n->pprev)  {
+	if (!hlist_unhashed(n)) {
 		__hlist_del(n);
 		INIT_HLIST_NODE(n);
 	}
diff --git a/trunk/include/net/inet_timewait_sock.h b/trunk/include/net/inet_timewait_sock.h
index 1da294c47522..e837f98fdb50 100644
--- a/trunk/include/net/inet_timewait_sock.h
+++ b/trunk/include/net/inet_timewait_sock.h
@@ -150,7 +150,7 @@ static inline void inet_twsk_add_bind_node(struct inet_timewait_sock *tw,
 
 static inline int inet_twsk_dead_hashed(const struct inet_timewait_sock *tw)
 {
-	return tw->tw_death_node.pprev != NULL;
+	return !hlist_unhashed(&tw->tw_death_node);
 }
 
 static inline void inet_twsk_dead_node_init(struct inet_timewait_sock *tw)
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index ff8b0dad7b0f..c9fad6fb629b 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -279,7 +279,7 @@ static inline int sk_unhashed(const struct sock *sk)
 
 static inline int sk_hashed(const struct sock *sk)
 {
-	return sk->sk_node.pprev != NULL;
+	return !sk_unhashed(sk);
 }
 
 static __inline__ void sk_node_init(struct hlist_node *node)