1 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
2 Date: Mon, 8 Jun 2015 16:11:40 +0200
3 Subject: [PATCH] brcmfmac: register wiphy(s) during module_init
5 Content-Type: text/plain; charset=UTF-8
6 Content-Transfer-Encoding: 8bit
8 This is needed by OpenWrt which expects all PHYs to be created after
9 module loads successfully.
11 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
14 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
15 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
16 @@ -1477,6 +1477,7 @@ int __init brcmf_core_init(void)
18 if (!schedule_work(&brcmf_driver_work))
20 + flush_work(&brcmf_driver_work);
24 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
25 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
26 @@ -431,6 +431,7 @@ struct brcmf_fw {
27 struct brcmf_fw_request *req;
29 void (*done)(struct device *dev, int err, struct brcmf_fw_request *req);
30 + struct completion *completion;
33 static void brcmf_fw_request_done(const struct firmware *fw, void *ctx);
34 @@ -638,6 +639,8 @@ static void brcmf_fw_request_done(const
37 fwctx->done(fwctx->dev, ret, fwctx->req);
38 + if (fwctx->completion)
39 + complete(fwctx->completion);
43 @@ -662,6 +665,8 @@ int brcmf_fw_get_firmwares(struct device
45 struct brcmf_fw_item *first = &req->items[0];
46 struct brcmf_fw *fwctx;
47 + struct completion completion;
48 + unsigned long time_left;
51 brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
52 @@ -678,6 +683,9 @@ int brcmf_fw_get_firmwares(struct device
57 + init_completion(&completion);
58 + fwctx->completion = &completion;
60 ret = request_firmware_nowait(THIS_MODULE, true, first->path,
61 fwctx->dev, GFP_KERNEL, fwctx,
62 @@ -685,6 +693,12 @@ int brcmf_fw_get_firmwares(struct device
64 brcmf_fw_request_done(NULL, fwctx);
67 + time_left = wait_for_completion_timeout(&completion,
68 + msecs_to_jiffies(5000));
69 + if (!time_left && fwctx)
70 + fwctx->completion = NULL;