projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: brcmfmac: fix support for up to 4 AP interfaces
[openwrt.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
d60d3fa
..
0bfaae6
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
@@
-11,19
+11,19
@@
module loads successfully.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
---- a/drivers/net/wireless/brcm80211/brcmfmac/core.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/core.c
-@@ -12
36,6 +1236,7 @@ static int __init brcmfmac_module_init(v
- #endif
+--- a/drivers/net/wireless/br
oadcom/br
cm80211/brcmfmac/core.c
++++ b/drivers/net/wireless/br
oadcom/br
cm80211/brcmfmac/core.c
+@@ -12
08,6 +1208,7 @@ int __init brcmf_core_init(void)
+ {
if (!schedule_work(&brcmf_driver_work))
return -EBUSY;
+ flush_work(&brcmf_driver_work);
return 0;
}
if (!schedule_work(&brcmf_driver_work))
return -EBUSY;
+ flush_work(&brcmf_driver_work);
return 0;
}
---- a/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
-@@ -4
20,6 +420
,7 @@ struct brcmf_fw {
+--- a/drivers/net/wireless/br
oadcom/br
cm80211/brcmfmac/firmware.c
++++ b/drivers/net/wireless/br
oadcom/br
cm80211/brcmfmac/firmware.c
+@@ -4
44,6 +444
,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)
-@@ -4
55,6 +456
,8 @@ static void brcmf_fw_request_nvram_done(
+@@ -4
78,6 +479
,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
62,6 +465
,8 @@ fail:
+@@ -4
85,6 +488
,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);
}
-@@ -
477,6 +482
,8 @@ static void brcmf_fw_request_code_done(c
+@@ -
500,6 +505
,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;
}
-@@ -
494,6 +501
,8 @@ static void brcmf_fw_request_code_done(c
+@@ -
517,6 +524
,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);
}
-@@ -5
05,6 +514
,8 @@ int brcmf_fw_get_firmwares_pcie(struct d
+@@ -5
28,6 +537
,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)
-@@ -5
25,9 +536
,17 @@ int brcmf_fw_get_firmwares_pcie(struct d
+@@ -5
48,9 +559
,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;