* [PATCH] brcm80211: fmac: use correct firmware filename
@ 2012-02-24 6:22 Rafał Miłecki
2012-02-24 9:49 ` Arend van Spriel
0 siblings, 1 reply; 2+ messages in thread
From: Rafał Miłecki @ 2012-02-24 6:22 UTC (permalink / raw)
To: linux-wireless, John W. Linville
Cc: Rafał Miłecki, Arend van Spriel
Also don't use so generic BRCMF_USB_FW_NAME as we may need different
firmwares in the future.
Cc: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
drivers/net/wireless/brcm80211/brcmfmac/usb.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 934ed78..9c14435 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -65,7 +65,7 @@
#define BRCMF_USB_CBCTL_READ 1
#define BRCMF_USB_MAX_PKT_SIZE 1600
-#define BRCMF_USB_FW_NAME "brcm/brcmfmac-usb.bin"
+#define BRCMF_USB_43236_FW_NAME "brcm/brcmfmac43236b.bin"
enum usbdev_suspend_state {
USBOS_SUSPEND_STATE_DEVICE_ACTIVE = 0, /* Device is busy, won't allow
@@ -1229,7 +1229,7 @@ static int brcmf_usb_get_fw(struct brcmf_usbdev_info *devinfo)
if (devinfo->image)
return 0;
- fwname = BRCMF_USB_FW_NAME;
+ fwname = BRCMF_USB_43236_FW_NAME;
err = request_firmware(&fw, fwname, devinfo->dev);
if (!fw) {
@@ -1596,7 +1596,7 @@ static struct usb_device_id brcmf_usb_devid_table[] = {
{ }
};
MODULE_DEVICE_TABLE(usb, brcmf_usb_devid_table);
-MODULE_FIRMWARE(BRCMF_USB_FW_NAME);
+MODULE_FIRMWARE(BRCMF_USB_43236_FW_NAME);
/* TODO: suspend and resume entries */
static struct usb_driver brcmf_usbdrvr = {
--
1.7.7
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] brcm80211: fmac: use correct firmware filename
2012-02-24 6:22 [PATCH] brcm80211: fmac: use correct firmware filename Rafał Miłecki
@ 2012-02-24 9:49 ` Arend van Spriel
0 siblings, 0 replies; 2+ messages in thread
From: Arend van Spriel @ 2012-02-24 9:49 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: linux-wireless@vger.kernel.org, John W. Linville
On 02/24/2012 07:22 AM, Rafał Miłecki wrote:
> Also don't use so generic BRCMF_USB_FW_NAME as we may need different
> firmwares in the future.
>
- Cc: Arend van Spriel<arend@broadcom.com>
+ Acked-by: Arend van Spriel <arend@broadcom.com>
> Signed-off-by: Rafał Miłecki<zajec5@gmail.com>
> ---
Gr. AvS
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-24 9:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-24 6:22 [PATCH] brcm80211: fmac: use correct firmware filename Rafał Miłecki
2012-02-24 9:49 ` Arend van Spriel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).