From 35d47a246e13e4734e72a5a4af89ee102620f683 Mon Sep 17 00:00:00 2001 From: Chen Ganir Date: Thu, 28 Jul 2011 15:42:09 +0300 Subject: [PATCH] --- yaml --- r: 263525 b: refs/heads/master c: 6be6b11f006840ba7d8d4b959b3fa0c522f8468a h: refs/heads/master i: 263523: 16df98efdd7b439702763e47513154a0d4f98aa9 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 ea9cc19a86ef..58730de425ed 100644 --- 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 index 7d713b1c4cbd..61f1f623091d 100644 --- 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);