aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2018-08-17 12:26:53 +0200
committerRafał Miłecki <rafal@milecki.pl>2018-08-17 12:28:08 +0200
commit9e864bfccea5919e5d5bf258fd37074fb7adf741 (patch)
tree267db6a49712bc6d468cdf32e7df1da190ac41bd /package/kernel
parent13f219569d4c7d470e235d62bc61afa992ae7119 (diff)
downloadupstream-9e864bfccea5919e5d5bf258fd37074fb7adf741.tar.gz
upstream-9e864bfccea5919e5d5bf258fd37074fb7adf741.tar.bz2
upstream-9e864bfccea5919e5d5bf258fd37074fb7adf741.zip
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 <rafal@milecki.pl>
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/mac80211/patches/331-v4.18-0009-brcmfmac-trigger-memory-dump-on-SDIO-firmware-halt-m.patch14
1 files changed, 12 insertions, 2 deletions
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 0861deb024..d050dc29b4 100644
--- 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 <arend.vanspriel@broadcom.com>
Signed-off-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>
+[rmilecki: add sdiod variable and use func[1]]
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
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 */