Hi Gustavo,
On Mon, Oct 10, 2011 at 06:07:06PM -0300, Gustavo Padovan wrote:
> > force_active variable inside l2cap_chan is a logical one and can
> > be easily converted to flag
> >
> > Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
> > ---
> > 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.
Sorry do not understand this :-(
Do you mean assign chan->flags = 0; and set_bit only for
FLAG_FORCE_ACTIVE?
Best regards
Andrei Emeltchenko
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
