diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 20:59:18 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 20:59:18 +0200 |
| commit | 5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch) | |
| tree | 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /include/net/sock.h | |
| parent | Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) (diff) | |
| parent | [TCP]: Fix snd_cwnd adjustments in tcp_highspeed.c (diff) | |
| download | linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.tar.xz linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.zip | |
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/sock.h')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index d8a5d87ad145..d27e748a8259 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -278,7 +278,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) |