From: Andrei Emeltchenko <andrei.emeltchenko.news@gmail.com>
To: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Cc: linux-bluetooth@vger.kernel.org, kanak.gupta@stericsson.com,
ulrik.lauren@stericsson.com, henrik.possung@stericsson.com
Subject: Re: [PATCH 2/2] Bluetooth: Fix usage of sk_sndtimeo value
Date: Thu, 10 Nov 2011 11:57:07 +0200 [thread overview]
Message-ID: <20111110095705.GA8486@aemeltch-MOBL1> (raw)
In-Reply-To: <1320917845-20135-3-git-send-email-andrzej.kaczmarek@tieto.com>
Hi Andrzej,
On Thu, Nov 10, 2011 at 10:37:25AM +0100, Andrzej Kaczmarek wrote:
> sk_sndtimeo timeout value is specified in jiffes and should be
> converted to miliseconds when used as input to __set_chan_timer.
>
> Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
> ---
> net/bluetooth/l2cap_core.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index f850684..3b0f807 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -446,7 +446,7 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason)
> if (chan->chan_type == L2CAP_CHAN_CONN_ORIENTED &&
> conn->hcon->type == ACL_LINK) {
> __clear_chan_timer(chan);
> - __set_chan_timer(chan, sk->sk_sndtimeo);
> + __set_chan_timer(chan, jiffies_to_msecs(sk->sk_sndtimeo));
Then __set_chan_timer do reverse conversion:
mod_timer(timer, jiffies + msecs_to_jiffies(timeout))
Look ugly :-(
Best regards
Andrei Emeltchenko
> l2cap_send_disconn_req(conn, chan, reason);
> } else
> l2cap_chan_del(chan, reason);
> @@ -899,7 +899,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
>
> __l2cap_chan_add(conn, chan);
>
> - __set_chan_timer(chan, sk->sk_sndtimeo);
> + __set_chan_timer(chan, jiffies_to_msecs(sk->sk_sndtimeo));
>
> l2cap_state_change(chan, BT_CONNECTED);
> parent->sk_data_ready(parent, 0);
> @@ -1176,7 +1176,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan)
> l2cap_chan_add(conn, chan);
>
> l2cap_state_change(chan, BT_CONNECT);
> - __set_chan_timer(chan, sk->sk_sndtimeo);
> + __set_chan_timer(chan, jiffies_to_msecs(sk->sk_sndtimeo));
>
> if (hcon->state == BT_CONNECTED) {
> if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) {
> @@ -2601,7 +2601,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd
>
> dcid = chan->scid;
>
> - __set_chan_timer(chan, sk->sk_sndtimeo);
> + __set_chan_timer(chan, jiffies_to_msecs(sk->sk_sndtimeo));
>
> chan->ident = cmd->ident;
>
> --
> on behalf of ST-Ericsson
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2011-11-10 9:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-10 9:37 [PATCH 0/2] Fix usage of sk_sndtimeo value in l2cap Andrzej Kaczmarek
2011-11-10 9:37 ` [PATCH 1/2] Buetooth: Revert "Fixed wrong L2CAP Sock timer value" Andrzej Kaczmarek
2011-11-10 9:37 ` [PATCH 2/2] Bluetooth: Fix usage of sk_sndtimeo value Andrzej Kaczmarek
2011-11-10 9:57 ` Andrei Emeltchenko [this message]
2011-11-10 10:13 ` Andrzej Kaczmarek
2011-11-10 10:35 ` Andrei Emeltchenko
2011-11-10 12:09 ` Andrzej Kaczmarek
2011-12-18 23:31 ` Gustavo 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=20111110095705.GA8486@aemeltch-MOBL1 \
--to=andrei.emeltchenko.news@gmail.com \
--cc=andrzej.kaczmarek@tieto.com \
--cc=henrik.possung@stericsson.com \
--cc=kanak.gupta@stericsson.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=ulrik.lauren@stericsson.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.