diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 14:59:18 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 14:59:18 -0400 |
| commit | 5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch) | |
| tree | 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /include/net/inet_timewait_sock.h | |
| parent | c0f1fe00c3923135b2c2f443448585482da8a53e (diff) | |
| parent | 5528e568a760442e0ec8fd2dea1f0791875a066b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/net/inet_timewait_sock.h')
| -rw-r--r-- | include/net/inet_timewait_sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index 519d3a077c62..600cb543550d 100644 --- a/include/net/inet_timewait_sock.h +++ b/include/net/inet_timewait_sock.h | |||
| @@ -149,7 +149,7 @@ static inline void inet_twsk_add_bind_node(struct inet_timewait_sock *tw, | |||
| 149 | 149 | ||
| 150 | static inline int inet_twsk_dead_hashed(const struct inet_timewait_sock *tw) | 150 | static inline int inet_twsk_dead_hashed(const struct inet_timewait_sock *tw) |
| 151 | { | 151 | { |
| 152 | return tw->tw_death_node.pprev != NULL; | 152 | return !hlist_unhashed(&tw->tw_death_node); |
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | static inline void inet_twsk_dead_node_init(struct inet_timewait_sock *tw) | 155 | static inline void inet_twsk_dead_node_init(struct inet_timewait_sock *tw) |