diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2015-05-26 12:14:34 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2015-05-26 12:14:34 +0000 |
commit | 2679f7071a5c3ddd97d927f7b38673cdc7885a97 (patch) | |
tree | 90bebd9bd31c0be18b3976a88d8601df2645e6f1 /package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch | |
parent | 17c4ddb6b92ef06c1918abecd3de8355afb4ab2d (diff) | |
download | master-187ad058-2679f7071a5c3ddd97d927f7b38673cdc7885a97.tar.gz master-187ad058-2679f7071a5c3ddd97d927f7b38673cdc7885a97.tar.bz2 master-187ad058-2679f7071a5c3ddd97d927f7b38673cdc7885a97.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45767 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 33 |
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: |