b43: Fix firmware caching

We must also store the ID string (filename) for the cached firmware blobs
and verify that we really have the right firmware cached before using it.
If we don't have the right fw cached, we must free it and request the
correct blobs.

This fixes bandswitch on A/B/G multi-PHY devices.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index c7eea30aa949..32a24f5c4fa6 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -665,16 +665,23 @@ struct b43_wl {
         bool beacon1_uploaded;
 };
 
+/* In-memory representation of a cached microcode file. */
+struct b43_firmware_file {
+        const char *filename;
+        const struct firmware *data;
+};
+
 /* Pointers to the firmware data and meta information about it. */
 struct b43_firmware {
         /* Microcode */
-        const struct firmware *ucode;
+        struct b43_firmware_file ucode;
         /* PCM code */
-        const struct firmware *pcm;
+        struct b43_firmware_file pcm;
         /* Initial MMIO values for the firmware */
-        const struct firmware *initvals;
+        struct b43_firmware_file initvals;
         /* Initial MMIO values for the firmware, band-specific */
-        const struct firmware *initvals_band;
+        struct b43_firmware_file initvals_band;
+
         /* Firmware revision */
         u16 rev;
         /* Firmware patchlevel */