projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a71a0cf
)
Bluetooth: Fixed wrong L2CAP Sock timer value
author
Chen Ganir
<chen.ganir@ti.com>
Thu, 28 Jul 2011 12:42:09 +0000
(15:42 +0300)
committer
Gustavo F. Padovan
<padovan@profusion.mobi>
Thu, 11 Aug 2011 22:50:27 +0000
(19:50 -0300)
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>
net/bluetooth/l2cap_sock.c
patch
|
blob
|
blame
|
history
diff --git
a/net/bluetooth/l2cap_sock.c
b/net/bluetooth/l2cap_sock.c
index 7d713b1c4cbd59baac469e42ab6b53b4a05b23ba..61f1f623091dbcd89992a64a635fc8de62963795 100644
(file)
--- 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);