summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorChen Ganir <chen.ganir@ti.com>2011-07-28 15:42:09 +0300
committerGustavo F. Padovan <padovan@profusion.mobi>2011-08-11 19:50:27 -0300
commit6be6b11f006840ba7d8d4b959b3fa0c522f8468a (patch)
tree78eb595f11c79fa2dbaceea93d7c34f1636570a8 /net/bluetooth
parenta71a0cf4e9cdb1c43843977a1efc43f96f6efc21 (diff)
downloadop-kernel-dev-6be6b11f006840ba7d8d4b959b3fa0c522f8468a.zip
op-kernel-dev-6be6b11f006840ba7d8d4b959b3fa0c522f8468a.tar.gz
Bluetooth: Fixed wrong L2CAP Sock timer value
L2CAP connection timeout needs to be assigned as miliseconds and not as jiffies. Signed-off-by: Chen Ganir <chen.ganir@ti.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 7d713b1..61f1f62 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/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);
OpenPOWER on IntegriCloud