From: Mat Martineau Date: Wed, 29 Jun 2011 21:35:21 +0000 (-0700) Subject: Bluetooth: ERTM timeouts need to be converted to jiffies X-Git-Tag: v3.1-rc1~316^2~124^2^2~58^2~29 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=942ecc9c4643db5ce071562e0a23f99464d6b461;p=~emulex%2Finfiniband.git 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 Signed-off-by: Gustavo F. Padovan --- diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index ab2bfcf3cd2..fb523813300 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); }