diff options
| author | Jakub Kicinski | 2022-03-23 10:52:56 -0700 |
|---|---|---|
| committer | Jakub Kicinski | 2022-03-23 10:53:49 -0700 |
| commit | 89695196f0ba78a17453f9616355f2ca6b293402 (patch) | |
| tree | 7a0f44d06e5b83002899667841baa9a3598bf819 /net/tipc | |
| parent | 764f4eb6846f5475f1244767d24d25dd86528a4a (diff) | |
| parent | f92fcb5c00dc924a4661d5bf68de7937040f26b8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in overtime fixes, no conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 7545321c3440..17f8c523e33b 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -2852,7 +2852,8 @@ static void tipc_sk_retry_connect(struct sock *sk, struct sk_buff_head *list) /* Try again later if dest link is congested */ if (tsk->cong_link_cnt) { - sk_reset_timer(sk, &sk->sk_timer, msecs_to_jiffies(100)); + sk_reset_timer(sk, &sk->sk_timer, + jiffies + msecs_to_jiffies(100)); return; } /* Prepare SYN for retransmit */ |