openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

netlink: Remove nonblock parameter from netlink_attachskb 

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2008-06-05 11:23:39 -07:00 committed by David S. Miller
parent 40aecb1b13
commit 9457afee85
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/netlink.h
View File

@ -193,7 +193,7 @@ extern int netlink_unregister_notifier(struct notifier_block *nb);
/* finegrained unicast helpers: */ /* finegrained unicast helpers: */
struct sock *netlink_getsockbyfilp(struct file *filp); struct sock *netlink_getsockbyfilp(struct file *filp);
int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, int netlink_attachskb(struct sock *sk, struct sk_buff *skb,
long *timeo, struct sock *ssk); long *timeo, struct sock *ssk);
void netlink_detachskb(struct sock *sk, struct sk_buff *skb); void netlink_detachskb(struct sock *sk, struct sk_buff *skb);
int netlink_sendskb(struct sock *sk, struct sk_buff *skb); int netlink_sendskb(struct sock *sk, struct sk_buff *skb);

2
ipc/mqueue.c
View File

@ -1054,7 +1054,7 @@ asmlinkage long sys_mq_notify(mqd_t mqdes,
} }
timeo = MAX_SCHEDULE_TIMEOUT; timeo = MAX_SCHEDULE_TIMEOUT;
ret = netlink_attachskb(sock, nc, 0, &timeo, NULL); ret = netlink_attachskb(sock, nc, &timeo, NULL);
if (ret == 1) if (ret == 1)
goto retry; goto retry;
if (ret) { if (ret) {

4
net/netlink/af_netlink.c
View File

@ -759,7 +759,7 @@ struct sock *netlink_getsockbyfilp(struct file *filp)
* 0: continue * 0: continue
* 1: repeat lookup - reference dropped while waiting for socket memory. * 1: repeat lookup - reference dropped while waiting for socket memory.
*/ */
int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, int netlink_attachskb(struct sock *sk, struct sk_buff *skb,
long *timeo, struct sock *ssk) long *timeo, struct sock *ssk)
{ {
struct netlink_sock *nlk; struct netlink_sock *nlk;
@ -892,7 +892,7 @@ int netlink_unicast(struct sock *ssk, struct sk_buff *skb,
return err; return err;
} }
err = netlink_attachskb(sk, skb, nonblock, &timeo, ssk); err = netlink_attachskb(sk, skb, &timeo, ssk);
if (err == 1) if (err == 1)
goto retry; goto retry;
if (err) if (err)