---

yaml --- r: 263525 b: refs/heads/master c: 6be6b11 h: refs/heads/master i: 263523: 16df98e v: v3
git-mirror · Aug 11, 2011 · 35d47a2 · 35d47a2
1 parent ac314cb
commit 35d47a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a71a0cf4e9cdb1c43843977a1efc43f96f6efc21
+refs/heads/master: 6be6b11f006840ba7d8d4b959b3fa0c522f8468a
diff --git a/trunk/net/bluetooth/l2cap_sock.c b/trunk/net/bluetooth/l2cap_sock.c
@@ -993,7 +993,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 = msecs_to_jiffies(L2CAP_CONN_TIMEOUT);
+	sk->sk_sndtimeo = L2CAP_CONN_TIMEOUT;
 
 	sock_reset_flag(sk, SOCK_ZAPPED);