aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-05-26 12:14:34 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-05-26 12:14:34 +0000
commit565eac46b6389f3bd83c92e7a67b2a2e1482636c (patch)
tree5da196627213967f0a836b43d7e5f1b551b95c07 /package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch
parent5e5c0edd7e0109a37ee18fdaf95f372b54bf1756 (diff)
downloadupstream-565eac46b6389f3bd83c92e7a67b2a2e1482636c.tar.gz
upstream-565eac46b6389f3bd83c92e7a67b2a2e1482636c.tar.bz2
upstream-565eac46b6389f3bd83c92e7a67b2a2e1482636c.zip
mac80211: backport today's brcmfmac changes
It should improve msgbuf throughput (PCIe devices like BCM43602). Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 45767
Diffstat (limited to 'package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch')
-rw-r--r--package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch b/package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch
new file mode 100644
index 0000000000..9b2880d8fc
--- /dev/null
+++ b/package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch
@@ -0,0 +1,33 @@
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+Date: Thu, 7 May 2015 14:13:03 +0200
+Subject: [PATCH] brcmfmac: check result of USB firmware request
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This prevents silence failures with driver waiting (infinitely) for a
+callback.
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Acked-by: Arend van Spriel <arend@broadcom.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+
+--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+@@ -1270,8 +1270,13 @@ static int brcmf_usb_probe_cb(struct brc
+ bus->chiprev = bus_pub->chiprev;
+
+ /* request firmware here */
+- brcmf_fw_get_firmwares(dev, 0, brcmf_usb_get_fwname(devinfo), NULL,
+- brcmf_usb_probe_phase2);
++ ret = brcmf_fw_get_firmwares(dev, 0, brcmf_usb_get_fwname(devinfo),
++ NULL, brcmf_usb_probe_phase2);
++ if (ret) {
++ brcmf_err("firmware request failed: %d\n", ret);
++ goto fail;
++ }
++
+ return 0;
+
+ fail: