diff options
author | Denis V. Lunev <den@openvz.org> | 2008-06-05 14:23:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-05 14:23:39 -0400 |
commit | 9457afee85e0dfc2b5075a391d6f34463b4c2b90 (patch) | |
tree | 39cf1262030ef195876c916a6f64201d66c48312 | |
parent | 40aecb1b13f50d96616abb612c17e59457f54263 (diff) |
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>
-rw-r--r-- | include/linux/netlink.h | 2 | ||||
-rw-r--r-- | ipc/mqueue.c | 2 | ||||
-rw-r--r-- | net/netlink/af_netlink.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index bec1062a25a1..9ff1b54908f3 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h | |||
@@ -193,7 +193,7 @@ extern int netlink_unregister_notifier(struct notifier_block *nb); | |||
193 | 193 | ||
194 | /* finegrained unicast helpers: */ | 194 | /* finegrained unicast helpers: */ |
195 | struct sock *netlink_getsockbyfilp(struct file *filp); | 195 | struct sock *netlink_getsockbyfilp(struct file *filp); |
196 | int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, | 196 | int netlink_attachskb(struct sock *sk, struct sk_buff *skb, |
197 | long *timeo, struct sock *ssk); | 197 | long *timeo, struct sock *ssk); |
198 | void netlink_detachskb(struct sock *sk, struct sk_buff *skb); | 198 | void netlink_detachskb(struct sock *sk, struct sk_buff *skb); |
199 | int netlink_sendskb(struct sock *sk, struct sk_buff *skb); | 199 | int netlink_sendskb(struct sock *sk, struct sk_buff *skb); |
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index b3b69fd51330..3e84b958186b 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
@@ -1054,7 +1054,7 @@ retry: | |||
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | timeo = MAX_SCHEDULE_TIMEOUT; | 1056 | timeo = MAX_SCHEDULE_TIMEOUT; |
1057 | ret = netlink_attachskb(sock, nc, 0, &timeo, NULL); | 1057 | ret = netlink_attachskb(sock, nc, &timeo, NULL); |
1058 | if (ret == 1) | 1058 | if (ret == 1) |
1059 | goto retry; | 1059 | goto retry; |
1060 | if (ret) { | 1060 | if (ret) { |
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 9b97f8006c9c..6507c02dbe0d 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
@@ -759,7 +759,7 @@ struct sock *netlink_getsockbyfilp(struct file *filp) | |||
759 | * 0: continue | 759 | * 0: continue |
760 | * 1: repeat lookup - reference dropped while waiting for socket memory. | 760 | * 1: repeat lookup - reference dropped while waiting for socket memory. |
761 | */ | 761 | */ |
762 | int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, | 762 | int netlink_attachskb(struct sock *sk, struct sk_buff *skb, |
763 | long *timeo, struct sock *ssk) | 763 | long *timeo, struct sock *ssk) |
764 | { | 764 | { |
765 | struct netlink_sock *nlk; | 765 | struct netlink_sock *nlk; |
@@ -892,7 +892,7 @@ retry: | |||
892 | return err; | 892 | return err; |
893 | } | 893 | } |
894 | 894 | ||
895 | err = netlink_attachskb(sk, skb, nonblock, &timeo, ssk); | 895 | err = netlink_attachskb(sk, skb, &timeo, ssk); |
896 | if (err == 1) | 896 | if (err == 1) |
897 | goto retry; | 897 | goto retry; |
898 | if (err) | 898 | if (err) |