Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6423cf3a authored by Andrzej Kaczmarek's avatar Andrzej Kaczmarek Committed by Johan Hedberg
Browse files

Bluetooth: Fix sk_sndtimeo initialization for L2CAP socket 



sk_sndtime value should be specified in jiffies thus initial value
needs to be converted from miliseconds. Otherwise this timeout is
unreliable when CONFIG_HZ is not set to 1000.

Signed-off-by: default avatarAndrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 25e89e99

net/bluetooth/l2cap_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -1002,7 +1002,7 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, int p 
	INIT_LIST_HEAD(&bt_sk(sk)->accept_q);



	sk->sk_destruct = l2cap_sock_destruct;

	sk->sk_sndtimeo = L2CAP_CONN_TIMEOUT;

	sk->sk_sndtimeo = msecs_to_jiffies(L2CAP_CONN_TIMEOUT);



	sock_reset_flag(sk, SOCK_ZAPPED);