From 25b30f5a724c3a24778b03bc000b85089755f5d2 Mon Sep 17 00:00:00 2001
From: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Date: Wed, 4 Jan 2012 12:10:41 +0100
Subject: [PATCH] --- yaml --- r: 287956 b: refs/heads/master c:
 a63752552b95624a9f1dfa3d763870f72f964ad0 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/net/bluetooth/l2cap_sock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5b3f30122f6e..781c77c2483b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4aa832c27edf902130f8bace1d42cf22468823fa
+refs/heads/master: a63752552b95624a9f1dfa3d763870f72f964ad0
diff --git a/trunk/net/bluetooth/l2cap_sock.c b/trunk/net/bluetooth/l2cap_sock.c
index c61d967012b2..c57027f7606f 100644
--- a/trunk/net/bluetooth/l2cap_sock.c
+++ b/trunk/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);