Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dd3abc1 authored by Daniel Kim's avatar Daniel Kim Committed by John W. Linville
Browse files

brcmfmac: Increase max buffer size for receiving control message from dongle 



The max buffer size for receiving control message from dongle needs to be
increased considering possible block padding. Otherwise some big control
message can't be received due to buffer overrun check.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarDaniel Kim <dekim@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6833965c

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

+5 −4
Original line number Diff line number Diff line
@@ -4086,8 +4086,13 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) 
		goto fail;

	}



	/* Query the F2 block size, set roundup accordingly */

	bus->blocksize = bus->sdiodev->func[2]->cur_blksize;

	bus->roundup = min(max_roundup, bus->blocksize);



	/* Allocate buffers */

	if (bus->sdiodev->bus_if->maxctl) {

		bus->sdiodev->bus_if->maxctl += bus->roundup;

		bus->rxblen =

		    roundup((bus->sdiodev->bus_if->maxctl + SDPCM_HDRLEN),

			    ALIGNMENT) + bus->head_align;
@@ -4115,10 +4120,6 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) 
	bus->idletime = BRCMF_IDLE_INTERVAL;

	bus->idleclock = BRCMF_IDLE_ACTIVE;



	/* Query the F2 block size, set roundup accordingly */

	bus->blocksize = bus->sdiodev->func[2]->cur_blksize;

	bus->roundup = min(max_roundup, bus->blocksize);



	/* SR state */

	bus->sleeping = false;

	bus->sr_enabled = false;