projects
/
librecmc
/
librecmc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to wireless-testing 2016-01-10
[librecmc/librecmc.git]
/
package
/
kernel
/
mac80211
/
patches
/
861-brcmfmac-register-wiphy-s-during-module_init.patch
diff --git
a/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch
b/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch
index 03ee2b5b866a47aea04b1b2ef374678bf51816db..95d93ae1f60f44f2a809a6d5912b03a5dc9f35e8 100644
(file)
--- a/
package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch
+++ b/
package/kernel/mac80211/patches/861-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
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-@@ -1
226,6 +1226
,7 @@ static int __init brcmfmac_module_init(v
+@@ -1
332,6 +1332
,7 @@ static int __init brcmfmac_module_init(v
#endif
if (!schedule_work(&brcmf_driver_work))
return -EBUSY;
#endif
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
}
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-@@ -4
20,6 +420
,7 @@ struct brcmf_fw {
+@@ -4
18,6 +418
,7 @@ struct brcmf_fw {
u16 bus_nr;
void (*done)(struct device *dev, const struct firmware *fw,
void *nvram_image, u32 nvram_len);
u16 bus_nr;
void (*done)(struct device *dev, const struct firmware *fw,
void *nvram_image, u32 nvram_len);
@@
-31,7
+31,7
@@
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
};
static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)
};
static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)
-@@ -45
4,6 +455
,8 @@ static void brcmf_fw_request_nvram_done(
+@@ -45
2,6 +453
,8 @@ static void brcmf_fw_request_nvram_done(
goto fail;
fwctx->done(fwctx->dev, fwctx->code, nvram, nvram_length);
goto fail;
fwctx->done(fwctx->dev, fwctx->code, nvram, nvram_length);
@@
-40,7
+40,7
@@
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
kfree(fwctx);
return;
kfree(fwctx);
return;
-@@ -4
61,6 +464
,8 @@ fail:
+@@ -4
59,6 +462
,8 @@ fail:
brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
release_firmware(fwctx->code);
device_release_driver(fwctx->dev);
brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
release_firmware(fwctx->code);
device_release_driver(fwctx->dev);
@@
-49,7
+49,7
@@
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
kfree(fwctx);
}
kfree(fwctx);
}
-@@ -47
6,6 +481
,8 @@ static void brcmf_fw_request_code_done(c
+@@ -47
4,6 +479
,8 @@ static void brcmf_fw_request_code_done(c
/* only requested code so done here */
if (!(fwctx->flags & BRCMF_FW_REQUEST_NVRAM)) {
fwctx->done(fwctx->dev, fw, NULL, 0);
/* only requested code so done here */
if (!(fwctx->flags & BRCMF_FW_REQUEST_NVRAM)) {
fwctx->done(fwctx->dev, fw, NULL, 0);
@@
-58,7
+58,7
@@
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
kfree(fwctx);
return;
}
kfree(fwctx);
return;
}
-@@ -49
3,6 +500
,8 @@ static void brcmf_fw_request_code_done(c
+@@ -49
1,6 +498
,8 @@ static void brcmf_fw_request_code_done(c
fail:
brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
device_release_driver(fwctx->dev);
fail:
brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
device_release_driver(fwctx->dev);
@@
-67,7
+67,7
@@
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
kfree(fwctx);
}
kfree(fwctx);
}
-@@ -50
4,6 +513
,8 @@ int brcmf_fw_get_firmwares_pcie(struct d
+@@ -50
2,6 +511
,8 @@ int brcmf_fw_get_firmwares_pcie(struct d
u16 domain_nr, u16 bus_nr)
{
struct brcmf_fw *fwctx;
u16 domain_nr, u16 bus_nr)
{
struct brcmf_fw *fwctx;
@@
-76,7
+76,7
@@
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
if (!fw_cb || !code)
brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
if (!fw_cb || !code)
-@@ -52
4,9 +535
,17 @@ int brcmf_fw_get_firmwares_pcie(struct d
+@@ -52
2,9 +533
,17 @@ int brcmf_fw_get_firmwares_pcie(struct d
fwctx->domain_nr = domain_nr;
fwctx->bus_nr = bus_nr;
fwctx->domain_nr = domain_nr;
fwctx->bus_nr = bus_nr;