diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2018-06-17 22:46:35 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2018-06-23 14:29:39 +0200 |
| commit | 72f6025d69ac0260b90192da481a52cd72f842fb (patch) | |
| tree | e11858583b15e2dafe9eb76c52b548590b8675f6 /package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch | |
| parent | 8cfd43d1d65aa70dff06ef2f63186a4c4285bccc (diff) | |
| download | upstream-72f6025d69ac0260b90192da481a52cd72f842fb.tar.gz upstream-72f6025d69ac0260b90192da481a52cd72f842fb.tar.bz2 upstream-72f6025d69ac0260b90192da481a52cd72f842fb.zip | |
mac80211: backport brcmfmac data structure rework
It backports brcmfmac commits from kernel 4.17.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 3c8bb92655c68a07abf5358ef23eb98422ed8d6d)
Diffstat (limited to 'package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch b/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch index a1670469d6..63849f48db 100644 --- a/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch +++ b/package/kernel/mac80211/patches/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 -@@ -1310,6 +1310,7 @@ int __init brcmf_core_init(void) +@@ -1314,6 +1314,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 -@@ -444,6 +444,7 @@ struct brcmf_fw { +@@ -445,6 +445,7 @@ struct brcmf_fw { u16 bus_nr; void (*done)(struct device *dev, int err, 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) -@@ -478,6 +479,8 @@ static void brcmf_fw_request_nvram_done( +@@ -479,6 +480,8 @@ static void brcmf_fw_request_nvram_done( goto fail; fwctx->done(fwctx->dev, 0, fwctx->code, nvram, nvram_length); @@ -40,7 +40,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> kfree(fwctx); return; -@@ -485,6 +488,8 @@ fail: +@@ -486,6 +489,8 @@ fail: brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev)); release_firmware(fwctx->code); fwctx->done(fwctx->dev, -ENOENT, NULL, NULL, 0); @@ -49,7 +49,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> kfree(fwctx); } -@@ -516,6 +521,8 @@ fail: +@@ -517,6 +522,8 @@ fail: brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev)); done: fwctx->done(fwctx->dev, ret, fw, NULL, 0); @@ -58,7 +58,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> kfree(fwctx); } -@@ -527,6 +534,8 @@ int brcmf_fw_get_firmwares_pcie(struct d +@@ -528,6 +535,8 @@ int brcmf_fw_get_firmwares_pcie(struct d u16 domain_nr, u16 bus_nr) { struct brcmf_fw *fwctx; @@ -67,7 +67,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev)); if (!fw_cb || !code) -@@ -547,9 +556,17 @@ int brcmf_fw_get_firmwares_pcie(struct d +@@ -548,9 +557,17 @@ int brcmf_fw_get_firmwares_pcie(struct d fwctx->domain_nr = domain_nr; fwctx->bus_nr = bus_nr; |