Commit 86dcd937 authored Apr 05, 2013 by Piotr Haber Committed by John W. Linville Apr 08, 2013

brcmfmac: firmware shared data version fix



Firware shared data structure is backward compatible for fields
we are interested in.
Allow reading of shared data in case of version mismatch.

Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Piotr Haber <phaber@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent baa9e609

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2721,8 +2721,8 @@ static int brcmf_sdio_readshared(struct brcmf_sdio *bus,
		sh->console_addr = le32_to_cpu(sh_le.console_addr);
		sh->msgtrace_addr = le32_to_cpu(sh_le.msgtrace_addr);

		if ((sh->flags & SDPCM_SHARED_VERSION_MASK) != SDPCM_SHARED_VERSION) {
		brcmf_err("sdpcm_shared version mismatch: dhd %d dongle %d\n",
		if ((sh->flags & SDPCM_SHARED_VERSION_MASK) > SDPCM_SHARED_VERSION) {
		brcmf_err("sdpcm shared version unsupported: dhd %d dongle %d\n",
		SDPCM_SHARED_VERSION,
		sh->flags & SDPCM_SHARED_VERSION_MASK);
		return -EPROTO;