linux-kernel - [PATCH] libertas sdio: look for 8688 firmware in common location

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1358494781-30160-1-git-send-email-lkundrak@v3.sk>
Date:	Fri, 18 Jan 2013 08:39:41 +0100
From:	Lubomir Rintel <lkundrak@...sk>
To:	Dan Williams <dcbw@...hat.com>
Cc:	Marcel Holtmann <marcel@...tmann.org>,
	Bing Zhao <bzhao@...vell.com>,
	Ben Hutchings <ben@...adent.org.uk>,
	David Woodhouse <dwmw2@...radead.org>,
	Gustavo Padovan <gustavo@...ovan.org>,
	Johan Hedberg <johan.hedberg@...il.com>,
	libertas-dev@...ts.infradead.org, linux-bluetooth@...r.kernel.org,
	linux-kernel@...r.kernel.org, Lubomir Rintel <lkundrak@...sk>
Subject: [PATCH] libertas sdio: look for 8688 firmware in common location

sd8688 is not only used by libertas WiFi, but shared with btmrvl bluetooth as
well.

Signed-off-by: Lubomir Rintel <lkundrak@...sk>
---
 drivers/net/wireless/libertas/if_sdio.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index 739309e..be16a76 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -85,6 +85,7 @@ static const struct lbs_fw_table fw_table[] = {
 	{ MODEL_8686, "libertas/sd8686_v9_helper.bin", "libertas/sd8686_v9.bin" },
 	{ MODEL_8686, "libertas/sd8686_v8_helper.bin", "libertas/sd8686_v8.bin" },
 	{ MODEL_8686, "sd8686_helper.bin", "sd8686.bin" },
+	{ MODEL_8688, "mrvl/sd8688_helper.bin", "mrvl/sd8688.bin" },
 	{ MODEL_8688, "libertas/sd8688_helper.bin", "libertas/sd8688.bin" },
 	{ MODEL_8688, "sd8688_helper.bin", "sd8688.bin" },
 	{ 0, NULL, NULL }
@@ -99,6 +100,8 @@ MODULE_FIRMWARE("libertas/sd8686_v8_helper.bin");
 MODULE_FIRMWARE("libertas/sd8686_v8.bin");
 MODULE_FIRMWARE("sd8686_helper.bin");
 MODULE_FIRMWARE("sd8686.bin");
+MODULE_FIRMWARE("mrvl/sd8688_helper.bin");
+MODULE_FIRMWARE("mrvl/sd8688.bin");
 MODULE_FIRMWARE("libertas/sd8688_helper.bin");
 MODULE_FIRMWARE("libertas/sd8688.bin");
 MODULE_FIRMWARE("sd8688_helper.bin");
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/