319-v4.12-0041-brcmfmac-ignore-interfaces-when-fwsignal-is-disabled.patch 1.3 KB

123456789101112131415161718192021222324252627282930
  1. From fc0471e3e884a13d293afae53917ef8ff33b8ae5 Mon Sep 17 00:00:00 2001
  2. From: Arend Van Spriel <arend.vanspriel@broadcom.com>
  3. Date: Thu, 6 Apr 2017 13:14:38 +0100
  4. Subject: [PATCH] brcmfmac: ignore interfaces when fwsignal is disabled
  5. When brcmf_fws_add_interface() is called the struct brcmf_if::fws_desc
  6. field is initialized regardless the state of the fwsignal functionality,
  7. ie. the fcmode. This is not needed when fcmode is NONE, which is the
  8. default mode.
  9. Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
  10. Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
  11. Reviewed-by: Franky Lin <franky.lin@broadcom.com>
  12. Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  13. Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  14. ---
  15. drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c | 2 +-
  16. 1 file changed, 1 insertion(+), 1 deletion(-)
  17. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
  18. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
  19. @@ -2145,7 +2145,7 @@ void brcmf_fws_add_interface(struct brcm
  20. struct brcmf_fws_info *fws = ifp->drvr->fws;
  21. struct brcmf_fws_mac_descriptor *entry;
  22. - if (!ifp->ndev)
  23. + if (!ifp->ndev || fws->fcmode == BRCMF_FWS_FCMODE_NONE)
  24. return;
  25. entry = &fws->desc.iface[ifp->ifidx];