From: Mat Martineau <mathewm@codeaurora.org>
To: linux-bluetooth@vger.kernel.org
Cc: padovan@profusion.mobi, Mat Martineau <mathewm@codeaurora.org>
Subject: [PATCH 3/6] Bluetooth: ERTM timeouts need to be converted to jiffies
Date: Wed, 29 Jun 2011 14:35:21 -0700 [thread overview]
Message-ID: <1309383324-12002-4-git-send-email-mathewm@codeaurora.org> (raw)
In-Reply-To: <1309383324-12002-1-git-send-email-mathewm@codeaurora.org>
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>
---
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 24c94a3..da6f532 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);
}
--
1.7.5.4
--
Mat Martineau
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
next prev parent reply other threads:[~2011-06-29 21:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-29 21:35 [PATCH 0/6] Bluetooth: ERTM fixes and local busy enhancement Mat Martineau
2011-06-29 21:35 ` [PATCH 1/6] Bluetooth: Check earlier for L2CAP ERTM frames to drop Mat Martineau
2011-06-30 21:24 ` Gustavo F. Padovan
2011-06-30 23:36 ` Mat Martineau
2011-07-01 19:13 ` Gustavo F. Padovan
2011-07-05 17:45 ` Mat Martineau
2011-06-29 21:35 ` [PATCH 2/6] Bluetooth: Fix indentation whitespace Mat Martineau
2011-06-30 21:29 ` Gustavo F. Padovan
2011-06-29 21:35 ` Mat Martineau [this message]
2011-06-30 21:27 ` [PATCH 3/6] Bluetooth: ERTM timeouts need to be converted to jiffies Gustavo F. Padovan
2011-06-29 21:35 ` [PATCH 4/6] Bluetooth: Move code for ERTM local busy state to separate functions Mat Martineau
2011-06-29 21:35 ` [PATCH 5/6] Bluetooth: Use event-driven approach for handling ERTM receive buffer Mat Martineau
2011-06-30 21:40 ` Gustavo F. Padovan
2011-07-01 17:29 ` Mat Martineau
2011-07-06 15:49 ` Gustavo Padovan
2011-06-29 21:35 ` [PATCH 6/6] Bluetooth: Remove L2CAP busy queue Mat Martineau
2011-06-30 21:42 ` Gustavo F. Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309383324-12002-4-git-send-email-mathewm@codeaurora.org \
--to=mathewm@codeaurora.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=padovan@profusion.mobi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).