OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
774e565
)
Bluetooth: ERTM timeouts need to be converted to jiffies
author
Mat Martineau
<mathewm@codeaurora.org>
Wed, 29 Jun 2011 21:35:21 +0000
(14:35 -0700)
committer
Gustavo F. Padovan
<padovan@profusion.mobi>
Thu, 30 Jun 2011 21:25:43 +0000
(18:25 -0300)
ERTM timeouts are defined in milliseconds, but need to be converted
to jiffies when passed to mod_timer().
Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
net/bluetooth/l2cap_core.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/l2cap_core.c
b/net/bluetooth/l2cap_core.c
index
ab2bfcf
..
fb52381
100644
(file)
--- a/
net/bluetooth/l2cap_core.c
+++ b/
net/bluetooth/l2cap_core.c
@@
-225,7
+225,7
@@
static void l2cap_set_timer(struct l2cap_chan *chan, struct timer_list *timer, l
{
BT_DBG("chan %p state %d timeout %ld", chan->sk, chan->state, timeout);
- if (!mod_timer(timer, jiffies +
timeout
))
+ if (!mod_timer(timer, jiffies +
msecs_to_jiffies(timeout)
))
chan_hold(chan);
}