From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6FAEC2D0BF for ; Tue, 10 Dec 2019 21:37:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7C90214AF for ; Tue, 10 Dec 2019 21:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013825; bh=/SA+SHJII3RxMzzB1bGENL7wAY4jwqgI+m4S3bcdUlc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iS+rN+uhwF8yhbFvi1oy+GAyQEoF8dmUtM3fobA7LT6sIu1AuqapLVDE2RIk879Mz hmLBl/8VcAagg+px56ZP/8Qh0BonIEUGaDNMae2AD0Bvw11dCQWfOeLNq5ak3vq73B 3urhg7P7NhlXEjOagKwv+g7cfQrP1rYuTJD6YP80= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730226AbfLJVhB (ORCPT ); Tue, 10 Dec 2019 16:37:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:41654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730329AbfLJVfl (ORCPT ); Tue, 10 Dec 2019 16:35:41 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C300524680; Tue, 10 Dec 2019 21:35:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013740; bh=/SA+SHJII3RxMzzB1bGENL7wAY4jwqgI+m4S3bcdUlc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t5Bzh9pcpCk9fhTTqFRWIwfe0VykfnXRlAaJdN5WH7QMBF2Gb7tgonDbYk/oYAiTW jLc8zzo2xL+r6xAI/5oCm3vQNqKdHFccFxayoPWsPyVvtqBENAphVmFXQSF2kXxyAr CYJ7tSmBEqxP7iXdF9pGSB+kN0gCUYHuiCOgCn+Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 163/177] brcmfmac: remove monitor interface when detaching Date: Tue, 10 Dec 2019 16:32:07 -0500 Message-Id: <20191210213221.11921-163-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210213221.11921-1-sashal@kernel.org> References: <20191210213221.11921-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Rafał Miłecki [ Upstream commit 4f61563da075bc8faefddfd5f8fc0cc14c49650a ] This fixes a minor WARNING in the cfg80211: [ 130.658034] ------------[ cut here ]------------ [ 130.662805] WARNING: CPU: 1 PID: 610 at net/wireless/core.c:954 wiphy_unregister+0xb4/0x198 [cfg80211] Signed-off-by: Rafał Miłecki Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index 0f56be13c7adf..584e05fdca6ad 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -1246,6 +1246,11 @@ void brcmf_detach(struct device *dev) brcmf_proto_detach_pre_delif(drvr); + if (drvr->mon_if) { + brcmf_net_detach(drvr->mon_if->ndev, false); + drvr->mon_if = NULL; + } + /* make sure primary interface removed last */ for (i = BRCMF_MAX_IFS-1; i > -1; i--) brcmf_remove_interface(drvr->iflist[i], false); -- 2.20.1