Re: [PATCH -v2 05/12] Bluetooth: Use chan->state instead of sk->sk_state

Marcel Holtmann
2012-05-27T05:04:11Z

Hi Gustavo,

> These vars are kept in sync so we can use chan->state here.
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> ---
> net/bluetooth/l2cap_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 3d35210..53e21ca 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -1444,7 +1444,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
>
> lock_sock(sk);
>
> - switch (sk->sk_state) {
> + switch (chan->state) {
> case BT_CONNECT:
> case BT_CONNECT2:
> case BT_CONFIG:

if this is so, then why are we bothering with the socket lock here?

Regards

Marcel