X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmac80211%2Fpatches%2Fbrcm%2F860-brcmfmac-register-wiphy-s-during-module_init.patch;h=1b965087d3e2d581fa7b69089716354c06a4ec26;hb=ed2015c38617ed6624471e77f27fbb0c58c8c660;hp=e70738322d2776bfe8fcddfa42b3cae45ce9489c;hpb=d9eefa7a7031543571d434693c7f984dfbdc990d;p=openwrt%2Fopenwrt.git

diff --git a/package/kernel/mac80211/patches/brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch b/package/kernel/mac80211/patches/brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch
index e70738322d..1b965087d3 100644
--- a/package/kernel/mac80211/patches/brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch
+++ b/package/kernel/mac80211/patches/brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch
@@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-@@ -1347,6 +1347,7 @@ int __init brcmf_core_init(void)
+@@ -1551,6 +1551,7 @@ int __init brcmf_core_init(void)
  {
  	if (!schedule_work(&brcmf_driver_work))
  		return -EBUSY;
@@ -23,7 +23,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  }
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-@@ -441,6 +441,7 @@ struct brcmf_fw {
+@@ -431,6 +431,7 @@ struct brcmf_fw {
  	struct brcmf_fw_request *req;
  	u32 curpos;
  	void (*done)(struct device *dev, int err, struct brcmf_fw_request *req);
@@ -31,35 +31,43 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  };
  
  static void brcmf_fw_request_done(const struct firmware *fw, void *ctx);
-@@ -589,6 +590,8 @@ fail:
- 	fwctx->req = NULL;
- done:
+@@ -638,6 +639,8 @@ static void brcmf_fw_request_done(const
+ 		fwctx->req = NULL;
+ 	}
  	fwctx->done(fwctx->dev, ret, fwctx->req);
 +	if (fwctx->completion)
 +		complete(fwctx->completion);
  	kfree(fwctx);
  }
  
-@@ -612,6 +615,8 @@ int brcmf_fw_get_firmwares(struct device
- 					 struct brcmf_fw_request *req))
+@@ -662,6 +665,8 @@ int brcmf_fw_get_firmwares(struct device
  {
+ 	struct brcmf_fw_item *first = &req->items[0];
  	struct brcmf_fw *fwctx;
 +	struct completion completion;
-+	int err;
++	unsigned long time_left;
+ 	int ret;
  
  	brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
- 	if (!fw_cb)
-@@ -628,7 +633,14 @@ int brcmf_fw_get_firmwares(struct device
+@@ -678,6 +683,9 @@ int brcmf_fw_get_firmwares(struct device
+ 	fwctx->dev = dev;
  	fwctx->req = req;
  	fwctx->done = fw_cb;
- 
++ 
 +	init_completion(&completion);
 +	fwctx->completion = &completion;
+ 
+ 	ret = request_firmware_nowait(THIS_MODULE, true, first->path,
+ 				      fwctx->dev, GFP_KERNEL, fwctx,
+@@ -685,6 +693,12 @@ int brcmf_fw_get_firmwares(struct device
+ 	if (ret < 0)
+ 		brcmf_fw_request_done(NULL, fwctx);
+ 
 +
- 	brcmf_fw_request_next_item(fwctx, true);
-+
-+	wait_for_completion_timeout(fwctx->completion, msecs_to_jiffies(5000));
-+	fwctx->completion = NULL;
++	time_left = wait_for_completion_timeout(&completion,
++						msecs_to_jiffies(5000));
++	if (!time_left && fwctx)
++		fwctx->completion = NULL;
 +
  	return 0;
  }