From: Mat Martineau <mathewm@codeaurora.org>
Date: Wed, 29 Jun 2011 21:35:21 +0000 (-0700)
Subject: Bluetooth: ERTM timeouts need to be converted to jiffies
X-Git-Tag: firefly_0821_release~7613^2~474
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6e35f04700b3ecc4f2b188f7d942eb3cf96a1e4e;p=firefly-linux-kernel-4.4.55.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 <mathewm@codeaurora.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 393f1a4b1c28..d3e425de9fe5 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);
 }