Re: [PATCH 3/4] Bluetooth: convert force_active variable to flag in l2cap chan

[Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com>]

On Tue, Oct 11, 2011 at 12:01:10PM +0200, Szymon Janc wrote:
> Hi,
> 
> > > Sorry do not understand this :-(
> > > 
> > > Do you mean assign chan->flags = 0; and set_bit only for
> > > FLAG_FORCE_ACTIVE?
> > 
> > Just sent patches with cumulative difference below:
> 
> I guess you could do similar in l2cap_sock_init() chan->flags = pchan->flags
> instead of test_bit/set_bit burst.

yes, I will change this way.

Best regards 
Andrei Emeltchenko 

>  
> > 
> > diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
> > index 3ca71b4..4b388b7 100644
> > --- a/net/bluetooth/l2cap_sock.c
> > +++ b/net/bluetooth/l2cap_sock.c
> > @@ -979,9 +979,7 @@ static void l2cap_sock_init(struct sock *sk, struct
> > sock *parent)
> >                 chan->fcs  = L2CAP_FCS_CRC16;
> >                 chan->tx_win = L2CAP_DEFAULT_TX_WINDOW;
> >                 chan->sec_level = BT_SECURITY_LOW;
> > -               clear_bit(FLAG_ROLE_SWITCH, &chan->flags);
> > -               clear_bit(FLAG_FORCE_RELIABLE, &chan->flags);
> > -               clear_bit(FLAG_FLUSHABLE, &chan->flags);
> > +               chan->flags = 0;
> >                 set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
> >         }
> 
> -- 
> BR
> Szymon Janc