[PATCH] hostap: allow flash download in kernel configuration

[Pavel Roskin]

Flash firmware download in Host AP is actually stable enough for general
use.  Allow enabling it in the kernel configuration.

Signed-off-by: Pavel Roskin <proski at gnu.org>

diff --git a/drivers/net/wireless/hostap/Kconfig b/drivers/net/wireless/hostap/Kconfig
index 56f41c7..1bba21c 100644
--- a/drivers/net/wireless/hostap/Kconfig
+++ b/drivers/net/wireless/hostap/Kconfig
@@ -26,8 +26,21 @@ 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
+	volatile memory, i.e. 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/.
+
+config HOSTAP_FIRMWARE_NVRAM
+	bool "Support for non-volatile firmware download"
+	depends on HOSTAP_FIRMWARE
+	---help---
+	Allow Host AP to write firmware images to non-volatile flash memory,
+	i.e. card memory that survives power cycling. Enable this option if
+	you want to be able to change card firmware permanently.
 
 	Firmware image downloading needs user space tool, prism2_srec. It is
 	available from http://hostap.epitest.fi/.
diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/hostap/hostap_config.h
index 7ed3425..cead232 100644
--- a/drivers/net/wireless/hostap/hostap_config.h
+++ b/drivers/net/wireless/hostap/hostap_config.h
@@ -31,6 +31,12 @@
 /* #define PRISM2_NON_VOLATILE_DOWNLOAD */
 #endif /* PRISM2_DOWNLOAD_SUPPORT */
 
+/* Allow kernel configuration to enable non-volatile download support. */
+#if !defined(PRISM2_NON_VOLATILE_DOWNLOAD) && \
+    defined(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.
  */
 /* #define PRISM2_IO_DEBUG */


-- 
Regards,
Pavel Roskin