diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-11-07 02:42:09 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-11-07 04:15:12 -0800 |
| commit | c3d8d1e30cace31fed6186a4b8c6b1401836d89c (patch) | |
| tree | 7122fccf27aa337438123071f3cb07999429de9e /include/linux | |
| parent | 230140cffa7feae90ad50bf259db1fa07674f3a7 (diff) | |
| download | op-kernel-dev-c3d8d1e30cace31fed6186a4b8c6b1401836d89c.zip op-kernel-dev-c3d8d1e30cace31fed6186a4b8c6b1401836d89c.tar.gz | |
[NETLINK]: Fix unicast timeouts
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>
Diffstat (limited to 'include/linux')
| -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 7c1f3b1..d5bfaba 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -192,7 +192,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); |
