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

Commit da472385 authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

brcmfmac: move brcmf_bus_preinit() call just after changing bus state 



Moving the brcmf_bus_preinit() call allows the bus code to do some
required initialization before handling firmware control messages.

Reviewed-by: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 86416468

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c

+0 −3
Original line number Diff line number Diff line
@@ -365,9 +365,6 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 


	/* Enable tx beamforming, errors can be ignored (not supported) */

	(void)brcmf_fil_iovar_int_set(ifp, "txbf", 1);



	/* do bus specific preinit here */

	err = brcmf_bus_preinit(ifp->drvr->bus_if);

done:

	return err;

}

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

+5 −0
Original line number Diff line number Diff line
@@ -1013,6 +1013,11 @@ int brcmf_bus_started(struct device *dev) 
	/* signal bus ready */

	brcmf_bus_change_state(bus_if, BRCMF_BUS_UP);



	/* do bus specific preinit here */

	ret = brcmf_bus_preinit(ifp->drvr->bus_if);

	if (ret < 0)

		goto fail;



	/* Bus is ready, do any initialization */

	ret = brcmf_c_preinit_dcmds(ifp);

	if (ret < 0)