diff options
Diffstat (limited to 'net/netlink/af_netlink.c')
| -rw-r--r-- | net/netlink/af_netlink.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 9247bf99c..eed55f8ac 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1,7 +1,7 @@ /* * NETLINK Kernel-user communication protocol. * - * Authors: Alan Cox <alan@cymru.net> + * Authors: Alan Cox <alan@redhat.com> * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> * * This program is free software; you can redistribute it and/or @@ -45,7 +45,7 @@ static struct sock *nl_table[MAX_LINKS]; static atomic_t nl_table_lock[MAX_LINKS]; -static struct wait_queue *nl_table_wait; +static DECLARE_WAIT_QUEUE_HEAD(nl_table_wait); #ifdef NL_EMULATE_DEV static struct socket *netlink_kernel[MAX_LINKS]; @@ -203,7 +203,7 @@ static int netlink_release(struct socket *sock, struct socket *peer) */ while (netlink_locked(sk)) { - current->counter = 0; + current->policy |= SCHED_YIELD; schedule(); } @@ -331,7 +331,7 @@ int netlink_unicast(struct sock *ssk, struct sk_buff *skb, u32 pid, int nonblock struct sock *sk; int len = skb->len; int protocol = ssk->protocol; - struct wait_queue wait = { current, NULL }; + DECLARE_WAITQUEUE(wait, current); retry: for (sk = nl_table[protocol]; sk; sk = sk->next) { |