Acked ///jon > -----Original Message----- > From: Tung Nguyen <[email protected]> > Sent: 15-Nov-19 04:07 > To: [email protected]; Jon Maloy > <[email protected]>; [email protected]; > [email protected] > Subject: [tipc-discussion] [net v1 1/1] 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]> > --- > net/tipc/socket.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/tipc/socket.c b/net/tipc/socket.c > index d7be43f5..506d264 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; > > -- > 2.1.4
_______________________________________________ tipc-discussion mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tipc-discussion
