From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754622AbcFPPKp (ORCPT ); Thu, 16 Jun 2016 11:10:45 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:57452 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754473AbcFPPKm convert rfc822-to-8bit (ORCPT ); Thu, 16 Jun 2016 11:10:42 -0400 From: Kalle Valo To: =?utf-8?Q?Rafa=C5=82_Mi=C5=82ecki?= Cc: Brett Rudley , Arend van Spriel , "Franky \(Zhenhui\) Lin" , Hante Meuleman , Pieter-Paul Giesberts , Franky Lin , linux-wireless@vger.kernel.org, brcm80211-dev-list@broadcom.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface after event timeout References: <1464378815-23282-1-git-send-email-zajec5@gmail.com> Date: Thu, 16 Jun 2016 18:10:35 +0300 In-Reply-To: <1464378815-23282-1-git-send-email-zajec5@gmail.com> (=?utf-8?Q?=22Rafa=C5=82=09Mi=C5=82ecki=22's?= message of "Fri, 27 May 2016 21:53:14 +0200") Message-ID: <877fdpw4no.fsf@kamboji.qca.qualcomm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rafał Miłecki writes: > Removing P2P interface is handled by sending a proper request to the > firmware. On success firmware triggers an event and driver's handler > removes a matching interface. > > However on event timeout we remove interface directly from the cfg80211 > callback. Current code doesn't handle this case correctly as it always > assumes rtnl to be unlocked. > > Fix it by adding an extra rtnl_locked parameter to functions and calling > unregister_netdevice when needed. > > Signed-off-by: Rafał Miłecki Failed to apply, please rebase: Applying: brcmfmac: fix lockup when removing P2P interface after event timeout Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c Failed to merge in the changes. Patch failed at 0001 brcmfmac: fix lockup when removing P2P interface after event timeout -- Kalle Valo