Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface after event timeout

From	Kalle Valo <kvalo@codeaurora.org>
Newsgroups	linux.kernel
Subject	Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface after event timeout
Date	2016-06-16 17:20 +0200
Message-ID	<rKHfk-1xv-35@gated-at.bofh.it> (permalink)
References	<rDw5k-7Db-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Rafał Miłecki <zajec5@gmail.com> 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 <zajec5@gmail.com>

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface after event timeout Kalle Valo <kvalo@codeaurora.org> - 2016-06-16 17:20 +0200
  Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface  after event timeout Rafał Miłecki <zajec5@gmail.com> - 2016-06-17 07:10 +0200
    Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface after event timeout Kalle Valo <kvalo@codeaurora.org> - 2016-06-17 07:20 +0200
      Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface  after event timeout Rafał Miłecki <zajec5@gmail.com> - 2016-06-17 07:40 +0200
        Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface after event timeout Kalle Valo <kvalo@codeaurora.org> - 2016-06-17 11:50 +0200

csiph-web