Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Brugger <mbrugger@suse.com>2019-01-10 19:12:26 +0100
committerMatthias Brugger <mbrugger@suse.com>2019-01-11 11:40:41 +0100
commit2a639adfdb8a9d323a81c67038b3f03463cc1a57 (patch)
tree89ad2bf9574519895d731a17a1d6637ec5637dc3
parenta5e003eb55aede77c06f5a778d154f9cb39442ac (diff)
brcmfmac: Cleanup brcmf_fw_request_done() (fate#326215).
-rw-r--r--patches.drivers/0006-brcmfmac-Cleanup-brcmf_fw_request_done.patch49
-rw-r--r--series.conf1
2 files changed, 50 insertions, 0 deletions
diff --git a/patches.drivers/0006-brcmfmac-Cleanup-brcmf_fw_request_done.patch b/patches.drivers/0006-brcmfmac-Cleanup-brcmf_fw_request_done.patch
new file mode 100644
index 0000000000..4b5b7129a4
--- /dev/null
+++ b/patches.drivers/0006-brcmfmac-Cleanup-brcmf_fw_request_done.patch
@@ -0,0 +1,49 @@
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 10 Oct 2018 13:01:03 +0200
+Subject: brcmfmac: Cleanup brcmf_fw_request_done()
+Git-commit: 55e491edbf14b2da5419c2a319ea3b1d6368d9a2
+Patch-mainline: v5.0-rc1
+References: fate#326215
+
+The "cur" variable is now only used for a debug print and we already
+print the same info from brcmf_fw_complete_request(), so the debug print
+does not provide any extra info and we can remove it.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+---
+ .../net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+index 6755b2388fbc..b38c4b40b235 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+@@ -560,22 +560,16 @@ static int brcmf_fw_request_firmware(const struct firmware **fw,
+ static void brcmf_fw_request_done(const struct firmware *fw, void *ctx)
+ {
+ struct brcmf_fw *fwctx = ctx;
+- struct brcmf_fw_item *cur;
+- int ret = 0;
+-
+- cur = &fwctx->req->items[fwctx->curpos];
++ int ret;
+
+ ret = brcmf_fw_complete_request(fw, fwctx);
+
+ while (ret == 0 && ++fwctx->curpos < fwctx->req->n_items) {
+- cur = &fwctx->req->items[fwctx->curpos];
+ brcmf_fw_request_firmware(&fw, fwctx);
+ ret = brcmf_fw_complete_request(fw, ctx);
+ }
+
+ if (ret) {
+- brcmf_dbg(TRACE, "failed err=%d: dev=%s, fw=%s\n", ret,
+- dev_name(fwctx->dev), cur->path);
+ brcmf_fw_free_request(fwctx->req);
+ fwctx->req = NULL;
+ }
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 10d697a120..dca2342373 100644
--- a/series.conf
+++ b/series.conf
@@ -41796,6 +41796,7 @@
patches.drivers/0003-brcmfmac-Add-support-for-first-trying-to-get-a-board.patch
patches.drivers/0004-brcmfmac-Set-board_type-used-for-nvram-file-selectio.patch
patches.drivers/0005-brcmfmac-Set-board_type-from-DMI-on-x86-based-machin.patch
+ patches.drivers/0006-brcmfmac-Cleanup-brcmf_fw_request_done.patch
patches.drivers/wlcore-Fix-the-return-value-in-case-of-error-in-wlco.patch
patches.drivers/rtl8xxxu-Fix-missing-break-in-switch.patch
patches.drivers/wireless-airo-potential-buffer-overflow-in-sprintf.patch