diff mbox series

[5.5] brcmfmac: remove monitor interface when detaching

Message ID 20191118123855.31696-1-zajec5@gmail.com (mailing list archive)
State Accepted
Commit 4f61563da075bc8faefddfd5f8fc0cc14c49650a
Delegated to: Kalle Valo
Headers show
Series [5.5] brcmfmac: remove monitor interface when detaching | expand

Commit Message

Rafał Miłecki Nov. 18, 2019, 12:38 p.m. UTC 
From: Rafał Miłecki <rafal@milecki.pl>

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 <rafal@milecki.pl>
---
Kalle: it doesn't seem critical enough for stable but would be nice to
       have for 5.5.
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Kalle Valo Nov. 20, 2019, 7:46 a.m. UTC | #1 
Rafał Miłecki wrote:

> From: Rafał Miłecki <rafal@milecki.pl>
> 
> 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 <rafal@milecki.pl>

Patch applied to wireless-drivers-next.git, thanks.

4f61563da075 brcmfmac: remove monitor interface when detaching
diff mbox series

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
index 406b367c284c..85cf96461dde 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -1350,6 +1350,11 @@  void brcmf_detach(struct device *dev)
 	brcmf_fweh_detach(drvr);
 	brcmf_proto_detach(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--) {
 		if (drvr->iflist[i])