diff options
| author | Chen Ganir <chen.ganir@ti.com> | 2011-07-28 15:42:09 +0300 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2011-08-09 11:04:34 -0700 |
| commit | 89c65d6d9dd87332d58c853e31938b98f7ac8463 (patch) | |
| tree | 52fb422d0b41df11ca92a6ecb59358574c71f98f /net/bluetooth | |
| parent | ed27e538aa97278e26a6c00f14f6e2e076a1a2ae (diff) | |
| download | kernel_samsung_crespo-89c65d6d9dd87332d58c853e31938b98f7ac8463.zip kernel_samsung_crespo-89c65d6d9dd87332d58c853e31938b98f7ac8463.tar.gz kernel_samsung_crespo-89c65d6d9dd87332d58c853e31938b98f7ac8463.tar.bz2 | |
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.c | 2 |
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); |