Return-Path: Date: Tue, 8 May 2012 04:44:51 -0300 From: Gustavo Padovan To: Andrei Emeltchenko , Mat Martineau , linux-bluetooth@vger.kernel.org, pkrystad@codeaurora.org Subject: Re: [PATCHv2 2/2] Bluetooth: Lock the L2CAP channel when sending Message-ID: <20120508074451.GA19057@joana> References: <1336166431-4926-1-git-send-email-mathewm@codeaurora.org> <1336166431-4926-3-git-send-email-mathewm@codeaurora.org> <20120505000104.GB23728@joana> <20120508074223.GA29352@aemeltch-MOBL1> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20120508074223.GA29352@aemeltch-MOBL1> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Hi Andrei, * Andrei Emeltchenko [2012-05-08 10:42:31 +0300]: > Hi Gustavo, > > On Fri, May 04, 2012 at 09:01:04PM -0300, Gustavo Padovan wrote: > > Hi Mat, > > > > * Mat Martineau [2012-05-04 14:20:31 -0700]: > > > > > The ERTM and streaming mode transmit queue must only be accessed while > > > the L2CAP channel lock is held. Locking the channel before calling > > > l2cap_chan_send ensures that multiple threads cannot simultaneously > > > manipulate the queue when sending and receiving concurrently. > > > > > > L2CAP channel locking had previously moved to the l2cap_chan struct > > > instead of the associated socket, so some of the old socket locking > > > can also be removed in this patch. > > > > > > Signed-off-by: Mat Martineau > > > --- > > > include/net/bluetooth/bluetooth.h | 2 -- > > > net/bluetooth/l2cap_sock.c | 19 +++++++++++-------- > > > 2 files changed, 11 insertions(+), 10 deletions(-) > > > > Patch has been applied to the bluetooth tree. Thanks. > > What about applying the first patch? I actually pulled that patch from > bluetooth-next and modified locking in my code but now that patch seems to > be lost. I applied it to bluetooth.git. Now you have to wait we merge bluetooth.git into bluetooth-next.git, that will happen shortly after John pull the pull request I sent. Gustavo