From: Andrzej Kaczmarek Date: Wed, 4 Jan 2012 11:10:41 +0000 (+0100) Subject: Bluetooth: Fix sk_sndtimeo initialization for L2CAP socket X-Git-Tag: v3.12-rc1~3664^2~112^2~264 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6423cf3a1862d5b162aaa13543bf69216a9f6ac0;p=kernel%2Fkernel-generic.git 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: Andrzej Kaczmarek Acked-by: Marcel Holtmann Signed-off-by: Johan Hedberg --- diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index c61d967..c57027f 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -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);