]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
brcmfmac: remove monitor interface when detaching
authorRafał Miłecki <rafal@milecki.pl>
Mon, 18 Nov 2019 12:38:55 +0000 (13:38 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 20 Nov 2019 07:46:14 +0000 (09:46 +0200)
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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

index 406b367c284ca4a0432adf267d70eef34d52c61f..85cf96461ddeb0808f723094cbb00ca39723a311 100644 (file)
@@ -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])