Re: [RFC 7/8] Bluetooth: Create DEFER_SETUP flag in conf_state

[Gustavo Padovan <gustavo@padovan.org>]

Hi Andrei,

* Andrei Emeltchenko <andrei.emeltchenko.news@gmail.com> [2012-05-24 12:50:06 +0300]:

> Hi Gustavo,
> 
> On Wed, May 23, 2012 at 10:12:43PM -0300, Gustavo Padovan wrote:
> > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> > 
> > Remove another socket usage from l2cap_core.c
> 
> Good idea.
> 
> ...
> > --- a/net/bluetooth/l2cap_sock.c
> > +++ b/net/bluetooth/l2cap_sock.c
> > @@ -623,10 +623,15 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
> >  			break;
> >  		}
> >  
> > -		if (opt)
> > +		if (opt) {
> >  			set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
> > -		else
> > +			set_bit(CONF_DEFER_SETUP, &chan->conf_state);
> > +		} else {
> >  			clear_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
> > +			clear_bit(CONF_DEFER_SETUP, &chan->conf_state);
> 
> Do we now have 2 similar flags?

Yes, and there is no other way to do this, BT_SK_DEFER_SETUP is for socket
related usage (mostly in af_bluetooth.c) and CONF_DEFER_SETUP is for
l2cap_core.c

> 
> > +		}
> > +
> > +
> 
> Remove extra line

Sure.

	Gustavo