From 50ca4a99ea695a053083dd9a7514d01fb07e0b81 Mon Sep 17 00:00:00 2001 From: Fugang Duan Date: Thu, 18 Apr 2019 16:21:20 +0800 Subject: [PATCH] MLK-21493 brcmfmac: move .brcmf_bus_preinit() after changing bus state Moving the brcmf_bus_preinit() call allows the bus code to do some required initialization before handling firmware control messages. .brcmf_bus_preinit() already is called in .brcmf_bus_started() when bus is ready. So remove it from .brcmf_c_preinit_dcmds(). Fixes: 383c26d2ea2f(MLK-18675-20 brcmfmac: Support wake on ping packet) Reviewed-by: Richard Zhu Signed-off-by: Fugang Duan --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c index 583416847b08..de7e04c1f583 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -363,8 +363,6 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) if (err) brcmf_info("Add unicast filter error (%d)\n", err); - /* do bus specific preinit here */ - err = brcmf_bus_preinit(ifp->drvr->bus_if); done: return err; } -- 2.17.1