package/kernel/mac80211/patches/327-v4.17-0006-brcmfmac-derive-firmware-filenames-from-basename-map.patch

   1 From 41f573dbb534f14e62a4a5411f602c970cad1d77 Mon Sep 17 00:00:00 2001
   2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
   3 Date: Thu, 22 Mar 2018 21:28:25 +0100
   4 Subject: [PATCH] brcmfmac: derive firmware filenames from basename mapping
   5
   6 Instead of defining individual filenames for firmware and nvram
   7 use a basename and derive the names from that.
   8
   9 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
  10 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
  11 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
  12 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  14 ---
  15  .../broadcom/brcm80211/brcmfmac/firmware.c         | 31 ++++++---
  16  .../broadcom/brcm80211/brcmfmac/firmware.h         | 24 ++-----
  17  .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    | 56 ++++++++---------
  18  .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    | 73 +++++++++++-----------
  19  .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 10 +--
  20  5 files changed, 96 insertions(+), 98 deletions(-)
  21
  22 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  23 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  24 @@ -563,6 +563,13 @@ int brcmf_fw_get_firmwares(struct device
  25                                            0);
  26  }
  27
  28 +static void brcmf_fw_get_full_name(char fw_name[BRCMF_FW_NAME_LEN],
  29 +                                  const char *fw_base, const char *extension)
  30 +{
  31 +       strlcat(fw_name, fw_base, BRCMF_FW_NAME_LEN);
  32 +       strlcat(fw_name, extension, BRCMF_FW_NAME_LEN);
  33 +}
  34 +
  35  int brcmf_fw_map_chip_to_name(u32 chip, u32 chiprev,
  36                               struct brcmf_firmware_mapping mapping_table[],
  37                               u32 table_size, char fw_name[BRCMF_FW_NAME_LEN],
  38 @@ -587,25 +594,31 @@ int brcmf_fw_map_chip_to_name(u32 chip,
  39
  40         /* check if firmware path is provided by module parameter */
  41         if (brcmf_mp_global.firmware_path[0] != '\0') {
  42 -               strlcpy(fw_name, brcmf_mp_global.firmware_path,
  43 -                       BRCMF_FW_NAME_LEN);
  44 -               if ((nvram_name) && (mapping_table[i].nvram))
  45 +               if (fw_name)
  46 +                       strlcpy(fw_name, brcmf_mp_global.firmware_path,
  47 +                               BRCMF_FW_NAME_LEN);
  48 +               if (nvram_name)
  49                         strlcpy(nvram_name, brcmf_mp_global.firmware_path,
  50                                 BRCMF_FW_NAME_LEN);
  51
  52                 end = brcmf_mp_global.firmware_path[
  53                                 strlen(brcmf_mp_global.firmware_path) - 1];
  54                 if (end != '/') {
  55 -                       strlcat(fw_name, "/", BRCMF_FW_NAME_LEN);
  56 -                       if ((nvram_name) && (mapping_table[i].nvram))
  57 +                       if (fw_name)
  58 +                               strlcat(fw_name, "/", BRCMF_FW_NAME_LEN);
  59 +                       if (nvram_name)
  60                                 strlcat(nvram_name, "/", BRCMF_FW_NAME_LEN);
  61                 }
  62         }
  63 -       strlcat(fw_name, mapping_table[i].fw, BRCMF_FW_NAME_LEN);
  64 -       if ((nvram_name) && (mapping_table[i].nvram))
  65 -               strlcat(nvram_name, mapping_table[i].nvram, BRCMF_FW_NAME_LEN);
  66
  67 -       brcmf_info("using %s for chip %s\n", fw_name, chipname);
  68 +       brcmf_info("using %s for chip %s\n",
  69 +                  mapping_table[i].fw_base, chipname);
  70 +       if (fw_name)
  71 +               brcmf_fw_get_full_name(fw_name,
  72 +                                      mapping_table[i].fw_base, ".bin");
  73 +       if (nvram_name)
  74 +               brcmf_fw_get_full_name(nvram_name,
  75 +                                      mapping_table[i].fw_base, ".txt");
  76
  77         return 0;
  78  }
  79 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
  80 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
  81 @@ -38,28 +38,16 @@
  82  struct brcmf_firmware_mapping {
  83         u32 chipid;
  84         u32 revmask;
  85 -       const char *fw;
  86 -       const char *nvram;
  87 +       const char *fw_base;
  88  };
  89
  90 -#define BRCMF_FW_NVRAM_DEF(fw_nvram_name, fw, nvram) \
  91 -static const char BRCM_ ## fw_nvram_name ## _FIRMWARE_NAME[] = \
  92 -       BRCMF_FW_DEFAULT_PATH fw; \
  93 -static const char BRCM_ ## fw_nvram_name ## _NVRAM_NAME[] = \
  94 -       BRCMF_FW_DEFAULT_PATH nvram; \
  95 -MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw);
  96 -
  97 -#define BRCMF_FW_DEF(fw_name, fw) \
  98 -static const char BRCM_ ## fw_name ## _FIRMWARE_NAME[] = \
  99 -       BRCMF_FW_DEFAULT_PATH fw; \
 100 -MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw) \
 101 -
 102 -#define BRCMF_FW_NVRAM_ENTRY(chipid, mask, name) \
 103 -       { chipid, mask, \
 104 -         BRCM_ ## name ## _FIRMWARE_NAME, BRCM_ ## name ## _NVRAM_NAME }
 105 +#define BRCMF_FW_DEF(fw_name, fw_base) \
 106 +static const char BRCM_ ## fw_name ## _FIRMWARE_BASENAME[] = \
 107 +       BRCMF_FW_DEFAULT_PATH fw_base; \
 108 +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".bin")
 109
 110  #define BRCMF_FW_ENTRY(chipid, mask, name) \
 111 -       { chipid, mask, BRCM_ ## name ## _FIRMWARE_NAME, NULL }
 112 +       { chipid, mask, BRCM_ ## name ## _FIRMWARE_BASENAME }
 113
 114  int brcmf_fw_map_chip_to_name(u32 chip, u32 chiprev,
 115                               struct brcmf_firmware_mapping mapping_table[],
 116 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
 117 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
 118 @@ -46,36 +46,36 @@ enum brcmf_pcie_state {
 119         BRCMFMAC_PCIE_STATE_UP
 120  };
 121
 122 -BRCMF_FW_NVRAM_DEF(43602, "brcmfmac43602-pcie.bin", "brcmfmac43602-pcie.txt");
 123 -BRCMF_FW_NVRAM_DEF(4350, "brcmfmac4350-pcie.bin", "brcmfmac4350-pcie.txt");
 124 -BRCMF_FW_NVRAM_DEF(4350C, "brcmfmac4350c2-pcie.bin", "brcmfmac4350c2-pcie.txt");
 125 -BRCMF_FW_NVRAM_DEF(4356, "brcmfmac4356-pcie.bin", "brcmfmac4356-pcie.txt");
 126 -BRCMF_FW_NVRAM_DEF(43570, "brcmfmac43570-pcie.bin", "brcmfmac43570-pcie.txt");
 127 -BRCMF_FW_NVRAM_DEF(4358, "brcmfmac4358-pcie.bin", "brcmfmac4358-pcie.txt");
 128 -BRCMF_FW_NVRAM_DEF(4359, "brcmfmac4359-pcie.bin", "brcmfmac4359-pcie.txt");
 129 -BRCMF_FW_NVRAM_DEF(4365B, "brcmfmac4365b-pcie.bin", "brcmfmac4365b-pcie.txt");
 130 -BRCMF_FW_NVRAM_DEF(4365C, "brcmfmac4365c-pcie.bin", "brcmfmac4365c-pcie.txt");
 131 -BRCMF_FW_NVRAM_DEF(4366B, "brcmfmac4366b-pcie.bin", "brcmfmac4366b-pcie.txt");
 132 -BRCMF_FW_NVRAM_DEF(4366C, "brcmfmac4366c-pcie.bin", "brcmfmac4366c-pcie.txt");
 133 -BRCMF_FW_NVRAM_DEF(4371, "brcmfmac4371-pcie.bin", "brcmfmac4371-pcie.txt");
 134 +BRCMF_FW_DEF(43602, "brcmfmac43602-pcie");
 135 +BRCMF_FW_DEF(4350, "brcmfmac4350-pcie");
 136 +BRCMF_FW_DEF(4350C, "brcmfmac4350c2-pcie");
 137 +BRCMF_FW_DEF(4356, "brcmfmac4356-pcie");
 138 +BRCMF_FW_DEF(43570, "brcmfmac43570-pcie");
 139 +BRCMF_FW_DEF(4358, "brcmfmac4358-pcie");
 140 +BRCMF_FW_DEF(4359, "brcmfmac4359-pcie");
 141 +BRCMF_FW_DEF(4365B, "brcmfmac4365b-pcie");
 142 +BRCMF_FW_DEF(4365C, "brcmfmac4365c-pcie");
 143 +BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie");
 144 +BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");
 145 +BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");
 146
 147  static struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
 148 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),
 149 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43465_CHIP_ID, 0xFFFFFFF0, 4366C),
 150 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C),
 151 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4350_CHIP_ID, 0xFFFFFF00, 4350),
 152 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43525_CHIP_ID, 0xFFFFFFF0, 4365C),
 153 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
 154 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43567_CHIP_ID, 0xFFFFFFFF, 43570),
 155 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43569_CHIP_ID, 0xFFFFFFFF, 43570),
 156 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43570_CHIP_ID, 0xFFFFFFFF, 43570),
 157 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4358_CHIP_ID, 0xFFFFFFFF, 4358),
 158 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),
 159 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4365_CHIP_ID, 0x0000000F, 4365B),
 160 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4365_CHIP_ID, 0xFFFFFFF0, 4365C),
 161 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0x0000000F, 4366B),
 162 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0xFFFFFFF0, 4366C),
 163 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),
 164 +       BRCMF_FW_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),
 165 +       BRCMF_FW_ENTRY(BRCM_CC_43465_CHIP_ID, 0xFFFFFFF0, 4366C),
 166 +       BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C),
 167 +       BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0xFFFFFF00, 4350),
 168 +       BRCMF_FW_ENTRY(BRCM_CC_43525_CHIP_ID, 0xFFFFFFF0, 4365C),
 169 +       BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
 170 +       BRCMF_FW_ENTRY(BRCM_CC_43567_CHIP_ID, 0xFFFFFFFF, 43570),
 171 +       BRCMF_FW_ENTRY(BRCM_CC_43569_CHIP_ID, 0xFFFFFFFF, 43570),
 172 +       BRCMF_FW_ENTRY(BRCM_CC_43570_CHIP_ID, 0xFFFFFFFF, 43570),
 173 +       BRCMF_FW_ENTRY(BRCM_CC_4358_CHIP_ID, 0xFFFFFFFF, 4358),
 174 +       BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),
 175 +       BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0x0000000F, 4365B),
 176 +       BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0xFFFFFFF0, 4365C),
 177 +       BRCMF_FW_ENTRY(BRCM_CC_4366_CHIP_ID, 0x0000000F, 4366B),
 178 +       BRCMF_FW_ENTRY(BRCM_CC_4366_CHIP_ID, 0xFFFFFFF0, 4366C),
 179 +       BRCMF_FW_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),
 180  };
 181
 182  #define BRCMF_PCIE_FW_UP_TIMEOUT               2000 /* msec */
 183 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 184 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 185 @@ -600,47 +600,44 @@ static const struct sdiod_drive_str sdio
 186         {4,  0x1}
 187  };
 188
 189 -BRCMF_FW_NVRAM_DEF(43143, "brcmfmac43143-sdio.bin", "brcmfmac43143-sdio.txt");
 190 -BRCMF_FW_NVRAM_DEF(43241B0, "brcmfmac43241b0-sdio.bin",
 191 -                  "brcmfmac43241b0-sdio.txt");
 192 -BRCMF_FW_NVRAM_DEF(43241B4, "brcmfmac43241b4-sdio.bin",
 193 -                  "brcmfmac43241b4-sdio.txt");
 194 -BRCMF_FW_NVRAM_DEF(43241B5, "brcmfmac43241b5-sdio.bin",
 195 -                  "brcmfmac43241b5-sdio.txt");
 196 -BRCMF_FW_NVRAM_DEF(4329, "brcmfmac4329-sdio.bin", "brcmfmac4329-sdio.txt");
 197 -BRCMF_FW_NVRAM_DEF(4330, "brcmfmac4330-sdio.bin", "brcmfmac4330-sdio.txt");
 198 -BRCMF_FW_NVRAM_DEF(4334, "brcmfmac4334-sdio.bin", "brcmfmac4334-sdio.txt");
 199 -BRCMF_FW_NVRAM_DEF(43340, "brcmfmac43340-sdio.bin", "brcmfmac43340-sdio.txt");
 200 -BRCMF_FW_NVRAM_DEF(4335, "brcmfmac4335-sdio.bin", "brcmfmac4335-sdio.txt");
 201 -BRCMF_FW_NVRAM_DEF(43362, "brcmfmac43362-sdio.bin", "brcmfmac43362-sdio.txt");
 202 -BRCMF_FW_NVRAM_DEF(4339, "brcmfmac4339-sdio.bin", "brcmfmac4339-sdio.txt");
 203 -BRCMF_FW_NVRAM_DEF(43430A0, "brcmfmac43430a0-sdio.bin", "brcmfmac43430a0-sdio.txt");
 204 +BRCMF_FW_DEF(43143, "brcmfmac43143-sdio");
 205 +BRCMF_FW_DEF(43241B0, "brcmfmac43241b0-sdio");
 206 +BRCMF_FW_DEF(43241B4, "brcmfmac43241b4-sdio");
 207 +BRCMF_FW_DEF(43241B5, "brcmfmac43241b5-sdio");
 208 +BRCMF_FW_DEF(4329, "brcmfmac4329-sdio");
 209 +BRCMF_FW_DEF(4330, "brcmfmac4330-sdio");
 210 +BRCMF_FW_DEF(4334, "brcmfmac4334-sdio");
 211 +BRCMF_FW_DEF(43340, "brcmfmac43340-sdio");
 212 +BRCMF_FW_DEF(4335, "brcmfmac4335-sdio");
 213 +BRCMF_FW_DEF(43362, "brcmfmac43362-sdio");
 214 +BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
 215 +BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
 216  /* Note the names are not postfixed with a1 for backward compatibility */
 217 -BRCMF_FW_NVRAM_DEF(43430A1, "brcmfmac43430-sdio.bin", "brcmfmac43430-sdio.txt");
 218 -BRCMF_FW_NVRAM_DEF(43455, "brcmfmac43455-sdio.bin", "brcmfmac43455-sdio.txt");
 219 -BRCMF_FW_NVRAM_DEF(4354, "brcmfmac4354-sdio.bin", "brcmfmac4354-sdio.txt");
 220 -BRCMF_FW_NVRAM_DEF(4356, "brcmfmac4356-sdio.bin", "brcmfmac4356-sdio.txt");
 221 -BRCMF_FW_NVRAM_DEF(4373, "brcmfmac4373-sdio.bin", "brcmfmac4373-sdio.txt");
 222 +BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");
 223 +BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");
 224 +BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
 225 +BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");
 226 +BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
 227
 228  static struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
 229 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
 230 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43241_CHIP_ID, 0x0000001F, 43241B0),
 231 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43241_CHIP_ID, 0x00000020, 43241B4),
 232 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43241_CHIP_ID, 0xFFFFFFC0, 43241B5),
 233 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4329_CHIP_ID, 0xFFFFFFFF, 4329),
 234 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, 4330),
 235 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, 4334),
 236 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, 43340),
 237 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43341_CHIP_ID, 0xFFFFFFFF, 43340),
 238 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, 4335),
 239 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362),
 240 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
 241 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
 242 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
 243 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455),
 244 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
 245 -       BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
 246 -       BRCMF_FW_NVRAM_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373)
 247 +       BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
 248 +       BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x0000001F, 43241B0),
 249 +       BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x00000020, 43241B4),
 250 +       BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0xFFFFFFC0, 43241B5),
 251 +       BRCMF_FW_ENTRY(BRCM_CC_4329_CHIP_ID, 0xFFFFFFFF, 4329),
 252 +       BRCMF_FW_ENTRY(BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, 4330),
 253 +       BRCMF_FW_ENTRY(BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, 4334),
 254 +       BRCMF_FW_ENTRY(BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, 43340),
 255 +       BRCMF_FW_ENTRY(BRCM_CC_43341_CHIP_ID, 0xFFFFFFFF, 43340),
 256 +       BRCMF_FW_ENTRY(BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, 4335),
 257 +       BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362),
 258 +       BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
 259 +       BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
 260 +       BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
 261 +       BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455),
 262 +       BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
 263 +       BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
 264 +       BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373)
 265  };
 266
 267  static void pkt_align(struct sk_buff *p, int len, int align)
 268 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
 269 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
 270 @@ -46,11 +46,11 @@
 271  #define BRCMF_USB_CBCTL_READ           1
 272  #define BRCMF_USB_MAX_PKT_SIZE         1600
 273
 274 -BRCMF_FW_DEF(43143, "brcmfmac43143.bin");
 275 -BRCMF_FW_DEF(43236B, "brcmfmac43236b.bin");
 276 -BRCMF_FW_DEF(43242A, "brcmfmac43242a.bin");
 277 -BRCMF_FW_DEF(43569, "brcmfmac43569.bin");
 278 -BRCMF_FW_DEF(4373, "brcmfmac4373.bin");
 279 +BRCMF_FW_DEF(43143, "brcmfmac43143");
 280 +BRCMF_FW_DEF(43236B, "brcmfmac43236b");
 281 +BRCMF_FW_DEF(43242A, "brcmfmac43242a");
 282 +BRCMF_FW_DEF(43569, "brcmfmac43569");
 283 +BRCMF_FW_DEF(4373, "brcmfmac4373");
 284
 285  static struct brcmf_firmware_mapping brcmf_usb_fwnames[] = {
 286         BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),