Skip to content

Commit

Permalink
Bluetooth: ERTM timeouts need to be converted to jiffies
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mat Martineau authored and Gustavo F. Padovan committed Jun 30, 2011
1 parent 774e565 commit 942ecc9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/bluetooth/l2cap_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 942ecc9

Please sign in to comment.