Skip to contentSkip to conversation

orinoco: disable support for prism chipset by default

PATCH New Pavel Roskin 1 participant 1 message Mar 12, 2010 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 orinoco: disable support for prism chipset by default

The hostap driver provides better support for Prism chipset.

---
 drivers/net/wireless/orinoco/Kconfig      |   13 ++++-
 drivers/net/wireless/orinoco/hw.c         |    7 +++
 drivers/net/wireless/orinoco/orinoco_cs.c |   79 +++++++++++++++--------------
 3 files changed, 60 insertions(+), 39 deletions(-)
drivers/net/wireless/orinoco/Kconfig +12 -1
index e2a2c18..6116b54 100644
@@ -27,6 +27,17 @@ config HERMES
 	  configure your card and that /etc/pcmcia/wireless.opts works :
 	  <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>
 
+config HERMES_PRISM
+	bool "Support Prism 2/2.5 chipset"
+	depends on HERMES
+	---help---
+
+	  Say Y to enable support for Prism 2 and 2.5 chipsets.  These
+	  chipsets are better handled by the hostap driver.  This driver
+	  would not support WPA or firmware download for Prism chipset.
+
+	  If you are not sure, say N.
+
 config HERMES_CACHE_FW_ON_INIT
 	bool "Cache Hermes firmware on driver initialisation"
 	depends on HERMES
@@ -86,7 +97,7 @@ config NORTEL_HERMES
 
 config PCI_HERMES
 	tristate "Prism 2.5 PCI 802.11b adaptor support"
-	depends on PCI && HERMES
+	depends on PCI && HERMES && HERMES_PRISM
 	help
 	  Enable support for PCI and mini-PCI 802.11b wireless NICs based on
 	  the Prism 2.5 chipset.  These are true PCI cards, not the 802.11b
drivers/net/wireless/orinoco/hw.c +7 -0
index e636924..883b8f8 100644
@@ -262,6 +262,13 @@ int determine_fw_capabilities(struct orinoco_private *priv,
 	if (fw_name)
 		dev_info(dev, "Firmware determined as %s\n", fw_name);
 
+#ifndef CONFIG_HERMES_PRISM
+	if (priv->firmware_type == FIRMWARE_TYPE_INTERSIL) {
+		dev_err(dev, "Support for Prism chipset is not enabled\n");
+		return -ENODEV;
+	}
+#endif
+
 	return 0;
 }
 
drivers/net/wireless/orinoco/orinoco_cs.c +41 -38

128 lines not on this page · raw message