mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
bc0c0a5564
This doesn't include 9ff8614a3dbe ("brcmfmac: use separate Kconfig file
for brcmfmac") due to a few conflicts with backports changes.
An important change is:
[PATCH 2/7] brcmfmac: change the order of things in brcmf_detach()
which fixes a rmmod crash in the brcmf_txfinalize().
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit db8e08a5a4)
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From 0d91defd7bfc42c0ed053ba03b5ea2eff2e1d2f5 Mon Sep 17 00:00:00 2001
|
|
From: Arend van Spriel <arend.vanspriel@broadcom.com>
|
|
Date: Thu, 11 Jul 2019 11:05:09 +0200
|
|
Subject: [PATCH 4/7] brcmfmac: clear events in brcmf_fweh_detach() will always
|
|
fail
|
|
|
|
Clearing firmware events in brcmf_fweh_detach() is always failing
|
|
because it is called only upon driver remove and communication
|
|
with firmware is no longer possible.
|
|
|
|
Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
|
|
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
|
|
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
|
|
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c | 9 ---------
|
|
1 file changed, 9 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
|
|
@@ -303,16 +303,7 @@ void brcmf_fweh_attach(struct brcmf_pub
|
|
void brcmf_fweh_detach(struct brcmf_pub *drvr)
|
|
{
|
|
struct brcmf_fweh_info *fweh = &drvr->fweh;
|
|
- struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
|
|
- s8 eventmask[BRCMF_EVENTING_MASK_LEN];
|
|
|
|
- if (ifp) {
|
|
- /* clear all events */
|
|
- memset(eventmask, 0, BRCMF_EVENTING_MASK_LEN);
|
|
- (void)brcmf_fil_iovar_data_set(ifp, "event_msgs",
|
|
- eventmask,
|
|
- BRCMF_EVENTING_MASK_LEN);
|
|
- }
|
|
/* cancel the worker */
|
|
cancel_work_sync(&fweh->event_work);
|
|
WARN_ON(!list_empty(&fweh->event_q));
|