mac80211: brcmfmac: fix compilation with SDIO support

This fixes following error when compiling with CONFIG_BRCMFMAC_SDIO=y:
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:1100:23: error: 'sdiod' undeclared (first use in this function)
   brcmf_dev_coredump(&sdiod->func1->dev);

Fixes: 9d8940c5b92f ("mac80211: brcmfmac: backport important changes from the 4.18")
Signed-off-by: Rafał Miłecki <[email protected]>

diff --git a/package/kernel/mac80211/patches/331-v4.18-0009-brcmfmac-trigger-memory-dump-on-SDIO-firmware-halt-m.patch b/package/kernel/mac80211/patches/331-v4.18-0009-brcmfmac-trigger-memory-dump-on-SDIO-firmware-halt-m.patch
index 0861deb024ce0499fd81b2436704a8564f5d369c..d050dc29b4fe9bb641d0f4d4a2c3105e73433a1c 100644 (file)
--- a/package/kernel/mac80211/patches/331-v4.18-0009-brcmfmac-trigger-memory-dump-on-SDIO-firmware-halt-m.patch
+++ b/package/kernel/mac80211/patches/331-v4.18-0009-brcmfmac-trigger-memory-dump-on-SDIO-firmware-halt-m.patch
@@ -10,20 +10,30 @@ Reviewed-by: Arend van Spriel <[email protected]>
 Signed-off-by: Franky Lin <[email protected]>
 Signed-off-by: Arend van Spriel <[email protected]>
 Signed-off-by: Kalle Valo <[email protected]>
+[rmilecki: add sdiod variable and use func[1]]
+Signed-off-by: Rafał Miłecki <[email protected]>
 ---
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-@@ -1095,8 +1095,10 @@ static u32 brcmf_sdio_hostmail(struct br
+@@ -1078,6 +1078,7 @@ static void brcmf_sdio_get_console_addr(
+ 
+ static u32 brcmf_sdio_hostmail(struct brcmf_sdio *bus)
+ {
++      struct brcmf_sdio_dev *sdiod = bus->sdiodev;
+       u32 intstatus = 0;
+       u32 hmb_data;
+       u8 fcbits;
+@@ -1095,8 +1096,10 @@ static u32 brcmf_sdio_hostmail(struct br
        bus->sdcnt.f1regdata += 2;
  
        /* dongle indicates the firmware has halted/crashed */
 -      if (hmb_data & HMB_DATA_FWHALT)
 +      if (hmb_data & HMB_DATA_FWHALT) {
                brcmf_err("mailbox indicates firmware halted\n");
-+              brcmf_dev_coredump(&sdiod->func1->dev);
++              brcmf_dev_coredump(&sdiod->func[1]->dev);
 +      }
  
        /* Dongle recomposed rx frames, accept them again */