diff options
| author |   Mat Martineau <mathewm@codeaurora.org> | 2011-06-29 14:35:21 -0700 |
|---|---|---|
| committer |   Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-30 18:25:43 -0300 |
| commit | 942ecc9c4643db5ce071562e0a23f99464d6b461 (patch) | |
| tree | f81de547f9206ffe749b4b9bf75d2a7864757d71 /net | |
| parent | Bluetooth: Fix indentation whitespace (diff) | |
| download | linux-dev-942ecc9c4643db5ce071562e0a23f99464d6b461.tar.xz linux-dev-942ecc9c4643db5ce071562e0a23f99464d6b461.zip | |
Bluetooth: ERTM timeouts need to be converted to jiffies
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index ab2bfcf3cd24..fb5238133005 100644 --- 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); } |