From: Gustavo Padovan <padovan@profusion.mobi>
To: Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com>
Cc: linux-bluetooth@vger.kernel.org
Subject: Re: [PATCH 3/4] Bluetooth: convert force_active variable to flag in l2cap chan
Date: Mon, 10 Oct 2011 18:07:06 -0300 [thread overview]
Message-ID: <20111010210706.GC6936@joana> (raw)
In-Reply-To: <1318232034-13410-3-git-send-email-Andrei.Emeltchenko.news@gmail.com>
Hi Andrei,
* Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com> [2011-10-10 10:33:53 +0300]:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> force_active variable inside l2cap_chan is a logical one and can
> be easily converted to flag
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> include/net/bluetooth/l2cap.h | 2 +-
> net/bluetooth/l2cap_core.c | 4 ++--
> net/bluetooth/l2cap_sock.c | 14 +++++++++-----
> 3 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
> index 6c0d247..440e7b8 100644
> --- a/include/net/bluetooth/l2cap.h
> +++ b/include/net/bluetooth/l2cap.h
> @@ -325,7 +325,6 @@ struct l2cap_chan {
>
> __u8 sec_level;
> __u8 role_switch;
> - __u8 force_active;
>
> __u8 ident;
>
> @@ -464,6 +463,7 @@ enum {
>
> /* Definitions for flags in l2cap_chan */
> enum {
> + FLAG_FORCE_ACTIVE,
> FLAG_FORCE_RELIABLE,
> FLAG_FLUSHABLE,
> };
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 57e4b2c..aeeacf8 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -605,7 +605,7 @@ static inline void l2cap_send_sframe(struct l2cap_chan *chan, u16 control)
> else
> flags = ACL_START;
>
> - bt_cb(skb)->force_active = chan->force_active;
> + bt_cb(skb)->force_active = test_bit(FLAG_FORCE_ACTIVE, &chan->flags);
>
> hci_send_acl(chan->conn->hcon, skb, flags);
> }
> @@ -1259,7 +1259,7 @@ static void l2cap_do_send(struct l2cap_chan *chan, struct sk_buff *skb)
> else
> flags = ACL_START;
>
> - bt_cb(skb)->force_active = chan->force_active;
> + bt_cb(skb)->force_active = test_bit(FLAG_FORCE_ACTIVE, &chan->flags);
> hci_send_acl(hcon, skb, flags);
> }
>
> diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
> index 51949f7..91c537d 100644
> --- a/net/bluetooth/l2cap_sock.c
> +++ b/net/bluetooth/l2cap_sock.c
> @@ -459,7 +459,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch
> break;
> }
>
> - pwr.force_active = chan->force_active;
> + pwr.force_active = test_bit(FLAG_FORCE_ACTIVE, &chan->flags);
>
> len = min_t(unsigned int, len, sizeof(pwr));
> if (copy_to_user(optval, (char *) &pwr, len))
> @@ -680,7 +680,11 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
> err = -EFAULT;
> break;
> }
> - chan->force_active = pwr.force_active;
> +
> + if (pwr.force_active)
> + set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
> + else
> + clear_bit(FLAG_FORCE_ACTIVE, &chan->flags);
> break;
>
> default:
> @@ -942,7 +946,8 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
> set_bit(FLAG_FORCE_RELIABLE, &chan->flags);
> if (test_bit(FLAG_FLUSHABLE, &pchan->flags))
> set_bit(FLAG_FLUSHABLE, &chan->flags);
> - chan->force_active = pchan->force_active;
> + if (test_bit(FLAG_FORCE_ACTIVE, &pchan->flags))
> + set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
> } else {
>
> switch (sk->sk_type) {
> @@ -973,8 +978,7 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
> chan->role_switch = 0;
> clear_bit(FLAG_FORCE_RELIABLE, &chan->flags);
> clear_bit(FLAG_FLUSHABLE, &chan->flags);
> - chan->force_active = BT_POWER_FORCE_ACTIVE_ON;
> -
> + set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
One last comment: set chan->flags to 0 here, the just to set the bits that
needs to be 1 at initialization.
Gustavo
next prev parent reply other threads:[~2011-10-10 21:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-10 7:33 [PATCH 1/4] Bluetooth: convert flushable variable to flag in l2cap chan Emeltchenko Andrei
2011-10-10 7:33 ` [PATCH 2/4] Bluetooth: convert force_reliable " Emeltchenko Andrei
2011-10-10 7:33 ` [PATCH 3/4] Bluetooth: convert force_active " Emeltchenko Andrei
2011-10-10 21:07 ` Gustavo Padovan [this message]
2011-10-11 7:50 ` Emeltchenko Andrei
2011-10-11 9:44 ` Emeltchenko Andrei
2011-10-11 10:01 ` Szymon Janc
2011-10-11 10:34 ` Emeltchenko Andrei
2011-10-10 7:33 ` [PATCH 4/4] Bluetooth: convert role_switch " Emeltchenko Andrei
-- strict thread matches above, loose matches on Subject: below --
2011-10-07 13:54 [PATCH 1/4] Bluetooth: convert flushable " Emeltchenko Andrei
2011-10-07 13:54 ` [PATCH 3/4] Bluetooth: convert force_active " Emeltchenko Andrei
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=20111010210706.GC6936@joana \
--to=padovan@profusion.mobi \
--cc=Andrei.Emeltchenko.news@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/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.