From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cyrus@holtmann.org>
Message-ID: <1337378968.2058.29.camel@aeonflux>
Subject: Re: [PATCH] Bluetooth: Do not purge queue in Basic Mode
From: Marcel Holtmann <marcel@holtmann.org>
To: Gustavo Padovan <gustavo@padovan.org>
Cc: linux-bluetooth@vger.kernel.org,
	Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Date: Fri, 18 May 2012 15:09:28 -0700
In-Reply-To: <1337378582-29271-1-git-send-email-gustavo@padovan.org>
References: <1337378582-29271-1-git-send-email-gustavo@padovan.org>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Sender: linux-bluetooth-owner@vger.kernel.org
List-ID: <linux-bluetooth.vger.kernel.org>

Hi Gustavo,

> chan->tx_q is only initialized if we use ERTM or Streaming mode.
> 
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> ---
>  net/bluetooth/l2cap_core.c |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index b70dca4..ccd2d85 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -549,6 +549,9 @@ static void l2cap_chan_del(struct l2cap_chan *chan, int err)
>  	if (test_bit(CONF_NOT_COMPLETE, &chan->conf_state))
>  		return;
>  
> +	if (chan->mode == L2CAP_MODE_BASIC)
> +		return;
> +
>  	skb_queue_purge(&chan->tx_q);
>  
>  	if (chan->mode == L2CAP_MODE_ERTM) {

please turn this into a switch statement. No point in checking
chan->mode twice.

Regards

Marcel