diff options
author | Patrick McHardy <kaber@trash.net> | 2007-11-13 12:23:22 +0100 |
---|---|---|
committer | Adrian Bunk <bunk@kernel.org> | 2007-11-13 12:23:22 +0100 |
commit | 47d5d333edbb27fe52da914c606dbc894826bcf3 (patch) | |
tree | 8a6dd2033b2310984554baa26c726f8bd46e2f68 /include | |
parent | 624e4ff675005168e71d297185f4b75dbdf650af (diff) |
[NETLINK]: Fix unicast timeouts
[ Upstream commit: c3d8d1e30cace31fed6186a4b8c6b1401836d89c ]
Commit ed6dcf4a in the history.git tree broke netlink_unicast timeouts
by moving the schedule_timeout() call to a new function that doesn't
propagate the remaining timeout back to the caller. This means on each
retry we start with the full timeout again.
ipc/mqueue.c seems to actually want to wait indefinitely so this
behaviour is retained.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netlink.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index c256ebe2a7b4..0868750de29d 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -161,7 +161,7 @@ extern int netlink_unregister_notifier(struct notifier_block *nb); /* finegrained unicast helpers: */ struct sock *netlink_getsockbyfilp(struct file *filp); int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, - long timeo, struct sock *ssk); + long *timeo, struct sock *ssk); void netlink_detachskb(struct sock *sk, struct sk_buff *skb); int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol); |