Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
commit
5047f09b56
211 changed files with 3295 additions and 1443 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue