netdev - [PATCH] brcmfmac: Delete second brcm folder hierarchy

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 for Android: free password hash cracker in your pocket

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

Message-Id: <20210602144305.4481-1-matthias.bgg@kernel.org>
Date:   Wed,  2 Jun 2021 16:43:05 +0200
From:   matthias.bgg@...nel.org
To:     Kalle Valo <kvalo@...eaurora.org>,
        "David S . Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>
Cc:     brcm80211-dev-list.pdl@...adcom.com,
        Chung-hsien Hsu <chung-hsien.hsu@...ineon.com>,
        netdev@...r.kernel.org,
        Hante Meuleman <hante.meuleman@...adcom.com>,
        linux-wireless@...r.kernel.org, Amar Shankar <amsr@...ress.com>,
        ivan.ivanov@...e.com, linux-kernel@...r.kernel.org,
        Dmitry Osipenko <digetx@...il.com>,
        SHA-cyfmac-dev-list@...ineon.com,
        Wright Feng <wright.feng@...ineon.com>,
        Remi Depommier <rde@...rix.com>,
        Franky Lin <franky.lin@...adcom.com>,
        Arend van Spriel <aspriel@...il.com>, dmueller@...e.de,
        Matthias Brugger <mbrugger@...e.com>,
        "Gustavo A . R . Silva" <gustavoars@...nel.org>,
        Chi-hsien Lin <chi-hsien.lin@...ineon.com>,
        Hans de Goede <hdegoede@...hat.com>,
        Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Subject: [PATCH] brcmfmac: Delete second brcm folder hierarchy

From: Matthias Brugger <mbrugger@...e.com>

BRCMF_FW_DEFAULT_PATH already defines the brcm folder, delete the second
folder to match with Linux firmware repository layout.

Fixes: 75729e110e68 ("brcmfmac: expose firmware config files through modinfo")
Signed-off-by: Matthias Brugger <mbrugger@...e.com>

---

 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 16ed325795a8..b8788d7090a4 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -626,8 +626,8 @@ BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
 BRCMF_FW_DEF(43012, "brcmfmac43012-sdio");
 
 /* firmware config files */
-MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-sdio.*.txt");
-MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-pcie.*.txt");
+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt");
+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.txt");
 
 static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
 	BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
-- 
2.31.1