diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2016-10-10 23:02:51 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-10 23:02:51 -0400 |
| commit | 3873691e5ab34fa26948643d038a2b98c4437298 (patch) | |
| tree | 5327469194c2167830bce38b56a618b754cdbeea /drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | |
| parent | fs: Replace current_fs_time() with current_time() (diff) | |
| parent | vfs: add note about i_op->rename changes to porting (diff) | |
| download | linux-dev-3873691e5ab34fa26948643d038a2b98c4437298.tar.xz linux-dev-3873691e5ab34fa26948643d038a2b98c4437298.zip | |
Merge remote-tracking branch 'ovl/rename2' into for-linus
Diffstat (limited to 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c')
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index 8d16f0204985..65e8c8766441 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -743,7 +743,7 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx, * serious troublesome side effects. The p2p module will clean * up the ifp if needed. */ - brcmf_p2p_ifp_removed(ifp); + brcmf_p2p_ifp_removed(ifp, rtnl_locked); kfree(ifp); } } |