[PATCH] hostap: allow flashing firmware

Host AP driver has code to support writing firmware to non-volatile
memory, a.k.a. flash.  This code has been extensively tested when Host
AP was a standalone driver.

Add a configuration option to the kernel to allow enabling this
functionality.  Improve the description of the RAM download option.
Mention cards that require it.  Remove obsolete scary comment.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 22 insertions, 13 deletions

diff --git a/drivers/net/wireless/hostap/Kconfig b/drivers/net/wireless/hostap/Kconfig
index 56f41c714d38..c8f6286dd35f 100644
--- a/drivers/net/wireless/hostap/Kconfig
+++ b/drivers/net/wireless/hostap/Kconfig
@@ -26,11 +26,25 @@ config HOSTAP_FIRMWARE
         depends on HOSTAP
         ---help---
         Configure Host AP driver to include support for firmware image
-        download. Current version supports only downloading to volatile, i.e.,
-        RAM memory. Flash upgrade is not yet supported.
+        download. This option by itself only enables downloading to the
+        volatile memory, i.e. the card RAM. This option is required to
+        support cards that don't have firmware in flash, such as D-Link
+        DWL-520 rev E and D-Link DWL-650 rev P.
 
-        Firmware image downloading needs user space tool, prism2_srec. It is
-        available from http://hostap.epitest.fi/.
+        Firmware image downloading needs a user space tool, prism2_srec.
+        It is available from http://hostap.epitest.fi/.
+
+config HOSTAP_FIRMWARE_NVRAM
+        bool "Support for non-volatile firmware download"
+        depends on HOSTAP_FIRMWARE
+        ---help---
+        Allow Host AP driver to write firmware images to the non-volatile
+        card memory, i.e. flash memory that survives power cycling.
+        Enable this option if you want to be able to change card firmware
+        permanently.
+
+        Firmware image downloading needs a user space tool, prism2_srec.
+        It is available from http://hostap.epitest.fi/.
 
 config HOSTAP_PLX
         tristate "Host AP driver for Prism2/2.5/3 in PLX9052 PCI adaptors"
diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/hostap/hostap_config.h
index 7ed3425d08c1..c090a5aebb58 100644
--- a/drivers/net/wireless/hostap/hostap_config.h
+++ b/drivers/net/wireless/hostap/hostap_config.h
@@ -21,15 +21,10 @@
 #define PRISM2_DOWNLOAD_SUPPORT
 #endif
 
-#ifdef PRISM2_DOWNLOAD_SUPPORT
-/* Allow writing firmware images into flash, i.e., to non-volatile storage.
- * Before you enable this option, you should make absolutely sure that you are
- * using prism2_srec utility that comes with THIS version of the driver!
- * In addition, please note that it is possible to kill your card with
- * non-volatile download if you are using incorrect image. This feature has not
- * been fully tested, so please be careful with it. */
-/* #define PRISM2_NON_VOLATILE_DOWNLOAD */
-#endif /* PRISM2_DOWNLOAD_SUPPORT */
+/* Allow kernel configuration to enable non-volatile download support. */
+#ifdef CONFIG_HOSTAP_FIRMWARE_NVRAM
+#define PRISM2_NON_VOLATILE_DOWNLOAD
+#endif
 
 /* Save low-level I/O for debugging. This should not be enabled in normal use.
  */