brcmfmac: simply remove flowring if bus is down

When the bus is down, eg. due to rmmod, there is no need to
attempt to inform firmware about it.

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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
index 241747bd5cb2b2aed59943f26124b8910c801018..8428be8b8d430b1dbaa075ce51407c17463db978 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
@@ -1398,6 +1398,13 @@ void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u16 flowid)
        u8 ifidx;
        int err;
 
+       /* no need to submit if firmware can not be reached */
+       if (drvr->bus_if->state != BRCMF_BUS_UP) {
+               brcmf_dbg(MSGBUF, "bus down, flowring will be removed\n");
+               brcmf_msgbuf_remove_flowring(msgbuf, flowid);
+               return;
+       }
+
        commonring = msgbuf->commonrings[BRCMF_H2D_MSGRING_CONTROL_SUBMIT];
        brcmf_commonring_lock(commonring);
        ret_ptr = brcmf_commonring_reserve_for_write(commonring);