diff options
| author | Tung Nguyen <[email protected]> | 2019-11-28 03:10:07 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2019-11-29 07:09:14 +0000 |
| commit | 12db3c8083fcab4270866a88191933f2d9f24f89 (patch) | |
| tree | ab550300560ce90590087070b8bc88c56897e16c /net/tipc/socket.c | |
| parent | tipc: fix wrong socket reference counter after tipc_sk_timeout() returns (diff) | |
| download | kernel-12db3c8083fcab4270866a88191933f2d9f24f89.tar.gz kernel-12db3c8083fcab4270866a88191933f2d9f24f89.zip | |
tipc: fix wrong timeout input for tipc_wait_for_cond()
In function __tipc_shutdown(), the timeout value passed to
tipc_wait_for_cond() is not jiffies.
This commit fixes it by converting that value from milliseconds
to jiffies.
Fixes: 365ad353c256 ("tipc: reduce risk of user starvation during link congestion")
Signed-off-by: Tung Nguyen <[email protected]>
Acked-by: Jon Maloy <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index fb5595081a05..da5fb84852a6 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -532,7 +532,7 @@ static void __tipc_shutdown(struct socket *sock, int error) struct sock *sk = sock->sk; struct tipc_sock *tsk = tipc_sk(sk); struct net *net = sock_net(sk); - long timeout = CONN_TIMEOUT_DEFAULT; + long timeout = msecs_to_jiffies(CONN_TIMEOUT_DEFAULT); u32 dnode = tsk_peer_node(tsk); struct sk_buff *skb; |