From ff1d2767d5a43c85f944e86a45284b721f66196c Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jkmaline@cc.hut.fi>
Date: Thu, 12 May 2005 22:54:16 -0400
Subject: Add HostAP wireless driver.

Includes minor cleanups from Adrian Bunk <bunk@stusta.de>.
---
 drivers/net/wireless/hostap/hostap_pci.c | 453 +++++++++++++++++++++++++++++++
 1 file changed, 453 insertions(+)
 create mode 100644 drivers/net/wireless/hostap/hostap_pci.c

(limited to 'drivers/net/wireless/hostap/hostap_pci.c')

diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
new file mode 100644
index 000000000000..3a208989333e
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -0,0 +1,453 @@
+#define PRISM2_PCI
+
+/* Host AP driver's support for Intersil Prism2.5 PCI cards is based on
+ * driver patches from Reyk Floeter <reyk@vantronix.net> and
+ * Andy Warner <andyw@pobox.com> */
+
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/if.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/workqueue.h>
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
+
+#include <linux/ioport.h>
+#include <linux/pci.h>
+#include <asm/io.h>
+
+#include "hostap_wlan.h"
+
+
+static char *version = PRISM2_VERSION " (Jouni Malinen <jkmaline@cc.hut.fi>)";
+static char *dev_info = "hostap_pci";
+
+
+MODULE_AUTHOR("Jouni Malinen");
+MODULE_DESCRIPTION("Support for Intersil Prism2.5-based 802.11 wireless LAN "
+		   "PCI cards.");
+MODULE_SUPPORTED_DEVICE("Intersil Prism2.5-based WLAN PCI cards");
+MODULE_LICENSE("GPL");
+
+
+/* FIX: do we need mb/wmb/rmb with memory operations? */
+
+
+static struct pci_device_id prism2_pci_id_table[] __devinitdata = {
+	/* Intersil Prism3 ISL3872 11Mb/s WLAN Controller */
+	{ 0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID },
+	/* Intersil Prism2.5 ISL3874 11Mb/s WLAN Controller */
+	{ 0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID },
+	/* Samsung MagicLAN SWL-2210P */
+	{ 0x167d, 0xa000, PCI_ANY_ID, PCI_ANY_ID },
+	{ 0 }
+};
+
+
+#ifdef PRISM2_IO_DEBUG
+
+static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)
+{
+	struct hostap_interface *iface;
+	local_info_t *local;
+	unsigned long flags;
+
+	iface = netdev_priv(dev);
+	local = iface->local;
+
+	spin_lock_irqsave(&local->lock, flags);
+	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTB, a, v);
+	writeb(v, local->mem_start + a);
+	spin_unlock_irqrestore(&local->lock, flags);
+}
+
+static inline u8 hfa384x_inb_debug(struct net_device *dev, int a)
+{
+	struct hostap_interface *iface;
+	local_info_t *local;
+	unsigned long flags;
+	u8 v;
+
+	iface = netdev_priv(dev);
+	local = iface->local;
+
+	spin_lock_irqsave(&local->lock, flags);
+	v = readb(local->mem_start + a);
+	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INB, a, v);
+	spin_unlock_irqrestore(&local->lock, flags);
+	return v;
+}
+
+static inline void hfa384x_outw_debug(struct net_device *dev, int a, u16 v)
+{
+	struct hostap_interface *iface;
+	local_info_t *local;
+	unsigned long flags;
+
+	iface = netdev_priv(dev);
+	local = iface->local;
+
+	spin_lock_irqsave(&local->lock, flags);
+	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTW, a, v);
+	writew(v, local->mem_start + a);
+	spin_unlock_irqrestore(&local->lock, flags);
+}
+
+static inline u16 hfa384x_inw_debug(struct net_device *dev, int a)
+{
+	struct hostap_interface *iface;
+	local_info_t *local;
+	unsigned long flags;
+	u16 v;
+
+	iface = netdev_priv(dev);
+	local = iface->local;
+
+	spin_lock_irqsave(&local->lock, flags);
+	v = readw(local->mem_start + a);
+	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INW, a, v);
+	spin_unlock_irqrestore(&local->lock, flags);
+	return v;
+}
+
+#define HFA384X_OUTB(v,a) hfa384x_outb_debug(dev, (a), (v))
+#define HFA384X_INB(a) hfa384x_inb_debug(dev, (a))
+#define HFA384X_OUTW(v,a) hfa384x_outw_debug(dev, (a), (v))
+#define HFA384X_INW(a) hfa384x_inw_debug(dev, (a))
+#define HFA384X_OUTW_DATA(v,a) hfa384x_outw_debug(dev, (a), cpu_to_le16((v)))
+#define HFA384X_INW_DATA(a) (u16) le16_to_cpu(hfa384x_inw_debug(dev, (a)))
+
+#else /* PRISM2_IO_DEBUG */
+
+static inline void hfa384x_outb(struct net_device *dev, int a, u8 v)
+{
+	struct hostap_interface *iface;
+	local_info_t *local;
+	iface = netdev_priv(dev);
+	local = iface->local;
+	writeb(v, local->mem_start + a);
+}
+
+static inline u8 hfa384x_inb(struct net_device *dev, int a)
+{
+	struct hostap_interface *iface;
+	local_info_t *local;
+	iface = netdev_priv(dev);
+	local = iface->local;
+	return readb(local->mem_start + a);
+}
+
+static inline void hfa384x_outw(struct net_device *dev, int a, u16 v)
+{
+	struct hostap_interface *iface;
+	local_info_t *local;
+	iface = netdev_priv(dev);
+	local = iface->local;
+	writew(v, local->mem_start + a);
+}
+
+static inline u16 hfa384x_inw(struct net_device *dev, int a)
+{
+	struct hostap_interface *iface;
+	local_info_t *local;
+	iface = netdev_priv(dev);
+	local = iface->local;
+	return readw(local->mem_start + a);
+}
+
+#define HFA384X_OUTB(v,a) hfa384x_outb(dev, (a), (v))
+#define HFA384X_INB(a) hfa384x_inb(dev, (a))
+#define HFA384X_OUTW(v,a) hfa384x_outw(dev, (a), (v))
+#define HFA384X_INW(a) hfa384x_inw(dev, (a))
+#define HFA384X_OUTW_DATA(v,a) hfa384x_outw(dev, (a), cpu_to_le16((v)))
+#define HFA384X_INW_DATA(a) (u16) le16_to_cpu(hfa384x_inw(dev, (a)))
+
+#endif /* PRISM2_IO_DEBUG */
+
+
+static int hfa384x_from_bap(struct net_device *dev, u16 bap, void *buf,
+			    int len)
+{
+	u16 d_off;
+	u16 *pos;
+
+	d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;
+	pos = (u16 *) buf;
+
+	for ( ; len > 1; len -= 2)
+		*pos++ = HFA384X_INW_DATA(d_off);
+
+	if (len & 1)
+		*((char *) pos) = HFA384X_INB(d_off);
+
+	return 0;
+}
+
+
+static int hfa384x_to_bap(struct net_device *dev, u16 bap, void *buf, int len)
+{
+	u16 d_off;
+	u16 *pos;
+
+	d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;
+	pos = (u16 *) buf;
+
+	for ( ; len > 1; len -= 2)
+		HFA384X_OUTW_DATA(*pos++, d_off);
+
+	if (len & 1)
+		HFA384X_OUTB(*((char *) pos), d_off);
+
+	return 0;
+}
+
+
+/* FIX: This might change at some point.. */
+#include "hostap_hw.c"
+
+static void prism2_pci_cor_sreset(local_info_t *local)
+{
+	struct net_device *dev = local->dev;
+	u16 reg;
+
+	reg = HFA384X_INB(HFA384X_PCICOR_OFF);
+	printk(KERN_DEBUG "%s: Original COR value: 0x%0x\n", dev->name, reg);
+
+	/* linux-wlan-ng uses extremely long hold and settle times for
+	 * COR sreset. A comment in the driver code mentions that the long
+	 * delays appear to be necessary. However, at least IBM 22P6901 seems
+	 * to work fine with shorter delays.
+	 *
+	 * Longer delays can be configured by uncommenting following line: */
+/* #define PRISM2_PCI_USE_LONG_DELAYS */
+
+#ifdef PRISM2_PCI_USE_LONG_DELAYS
+	int i;
+
+	HFA384X_OUTW(reg | 0x0080, HFA384X_PCICOR_OFF);
+	mdelay(250);
+
+	HFA384X_OUTW(reg & ~0x0080, HFA384X_PCICOR_OFF);
+	mdelay(500);
+
+	/* Wait for f/w to complete initialization (CMD:BUSY == 0) */
+	i = 2000000 / 10;
+	while ((HFA384X_INW(HFA384X_CMD_OFF) & HFA384X_CMD_BUSY) && --i)
+		udelay(10);
+
+#else /* PRISM2_PCI_USE_LONG_DELAYS */
+
+	HFA384X_OUTW(reg | 0x0080, HFA384X_PCICOR_OFF);
+	mdelay(2);
+	HFA384X_OUTW(reg & ~0x0080, HFA384X_PCICOR_OFF);
+	mdelay(2);
+
+#endif /* PRISM2_PCI_USE_LONG_DELAYS */
+
+	if (HFA384X_INW(HFA384X_CMD_OFF) & HFA384X_CMD_BUSY) {
+		printk(KERN_DEBUG "%s: COR sreset timeout\n", dev->name);
+	}
+}
+
+
+static void prism2_pci_genesis_reset(local_info_t *local, int hcr)
+{
+	struct net_device *dev = local->dev;
+
+	HFA384X_OUTW(0x00C5, HFA384X_PCICOR_OFF);
+	mdelay(10);
+	HFA384X_OUTW(hcr, HFA384X_PCIHCR_OFF);
+	mdelay(10);
+	HFA384X_OUTW(0x0045, HFA384X_PCICOR_OFF);
+	mdelay(10);
+}
+
+
+static struct prism2_helper_functions prism2_pci_funcs =
+{
+	.card_present	= NULL,
+	.cor_sreset	= prism2_pci_cor_sreset,
+	.dev_open	= NULL,
+	.dev_close	= NULL,
+	.genesis_reset	= prism2_pci_genesis_reset,
+	.hw_type	= HOSTAP_HW_PCI,
+};
+
+
+static int prism2_pci_probe(struct pci_dev *pdev,
+			    const struct pci_device_id *id)
+{
+	unsigned long phymem;
+	void __iomem *mem = NULL;
+	local_info_t *local = NULL;
+	struct net_device *dev = NULL;
+	static int cards_found /* = 0 */;
+	int irq_registered = 0;
+	struct hostap_interface *iface;
+
+	if (pci_enable_device(pdev))
+		return -EIO;
+
+	phymem = pci_resource_start(pdev, 0);
+
+	if (!request_mem_region(phymem, pci_resource_len(pdev, 0), "Prism2")) {
+		printk(KERN_ERR "prism2: Cannot reserve PCI memory region\n");
+		goto err_out_disable;
+	}
+
+	mem = ioremap(phymem, pci_resource_len(pdev, 0));
+	if (mem == NULL) {
+		printk(KERN_ERR "prism2: Cannot remap PCI memory region\n") ;
+		goto fail;
+	}
+
+#ifdef PRISM2_BUS_MASTER
+	pci_set_master(pdev);
+#endif /* PRISM2_BUS_MASTER */
+
+	dev = prism2_init_local_data(&prism2_pci_funcs, cards_found);
+	if (dev == NULL)
+		goto fail;
+	iface = netdev_priv(dev);
+	local = iface->local;
+	cards_found++;
+
+        dev->irq = pdev->irq;
+        local->mem_start = mem;
+
+	prism2_pci_cor_sreset(local);
+
+	pci_set_drvdata(pdev, dev);
+
+	if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name,
+			dev)) {
+		printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
+		goto fail;
+	} else
+		irq_registered = 1;
+
+	if (!local->pri_only && prism2_hw_config(dev, 1)) {
+		printk(KERN_DEBUG "%s: hardware initialization failed\n",
+		       dev_info);
+		goto fail;
+	}
+
+	printk(KERN_INFO "%s: Intersil Prism2.5 PCI: "
+	       "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq);
+
+	return hostap_hw_ready(dev);
+
+ fail:
+	if (irq_registered && dev)
+		free_irq(dev->irq, dev);
+
+	if (mem)
+		iounmap(mem);
+
+	release_mem_region(phymem, pci_resource_len(pdev, 0));
+
+ err_out_disable:
+	pci_disable_device(pdev);
+	prism2_free_local_data(dev);
+
+	return -ENODEV;
+}
+
+
+static void prism2_pci_remove(struct pci_dev *pdev)
+{
+	struct net_device *dev;
+	struct hostap_interface *iface;
+	void __iomem *mem_start;
+
+	dev = pci_get_drvdata(pdev);
+	iface = netdev_priv(dev);
+
+	/* Reset the hardware, and ensure interrupts are disabled. */
+	prism2_pci_cor_sreset(iface->local);
+	hfa384x_disable_interrupts(dev);
+
+	if (dev->irq)
+		free_irq(dev->irq, dev);
+
+	mem_start = iface->local->mem_start;
+	prism2_free_local_data(dev);
+
+	iounmap(mem_start);
+
+	release_mem_region(pci_resource_start(pdev, 0),
+			   pci_resource_len(pdev, 0));
+	pci_disable_device(pdev);
+}
+
+
+#ifdef CONFIG_PM
+static int prism2_pci_suspend(struct pci_dev *pdev, u32 state)
+{
+	struct net_device *dev = pci_get_drvdata(pdev);
+
+	if (netif_running(dev)) {
+		netif_stop_queue(dev);
+		netif_device_detach(dev);
+	}
+	prism2_suspend(dev);
+	pci_save_state(pdev);
+	pci_disable_device(pdev);
+	pci_set_power_state(pdev, 3);
+
+	return 0;
+}
+
+static int prism2_pci_resume(struct pci_dev *pdev)
+{
+	struct net_device *dev = pci_get_drvdata(pdev);
+
+	pci_enable_device(pdev);
+	pci_restore_state(pdev);
+	prism2_hw_config(dev, 0);
+	if (netif_running(dev)) {
+		netif_device_attach(dev);
+		netif_start_queue(dev);
+	}
+
+	return 0;
+}
+#endif /* CONFIG_PM */
+
+
+MODULE_DEVICE_TABLE(pci, prism2_pci_id_table);
+
+static struct pci_driver prism2_pci_drv_id = {
+	.name		= "prism2_pci",
+	.id_table	= prism2_pci_id_table,
+	.probe		= prism2_pci_probe,
+	.remove		= prism2_pci_remove,
+#ifdef CONFIG_PM
+	.suspend	= prism2_pci_suspend,
+	.resume		= prism2_pci_resume,
+#endif /* CONFIG_PM */
+	/* Linux 2.4.6 added save_state and enable_wake that are not used here
+	 */
+};
+
+
+static int __init init_prism2_pci(void)
+{
+	printk(KERN_INFO "%s: %s\n", dev_info, version);
+
+	return pci_register_driver(&prism2_pci_drv_id);
+}
+
+
+static void __exit exit_prism2_pci(void)
+{
+	pci_unregister_driver(&prism2_pci_drv_id);
+	printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
+}
+
+
+module_init(init_prism2_pci);
+module_exit(exit_prism2_pci);
-- 
cgit v1.2.3


From 0cd545d6ba0e0138782eb0ec287d0eb3db529b69 Mon Sep 17 00:00:00 2001
From: Dave Hansen <haveblue@us.ibm.com>
Date: Sat, 30 Jul 2005 12:49:58 -0700
Subject: [PATCH] hostap update

Create sysfs "device" files for hostap

I was writing some scripts to automatically build kismet source lines,
and I noticed that hostap devices don't have device files, unlike my
prism54 and ipw2200 cards:

$ ls -l /sys/class/net/eth0/device
/sys/class/net/eth0/device -> ../../../devices/pci0000:00/0000:00:1e.0/0000:02:01.0
$ ls -l /sys/class/net/wifi0
ls: /sys/class/net/wifi0/device: No such file or directory
$ ls -l /sys/class/net/wlan0
ls: /sys/class/net/wlan0/device: No such file or directory

The following (quite small) patch makes sure that both the wlan and wifi
net devices have that pointer to the bus device.

This way, I can do things like

        for i in /sys/class/net/*; do
                if ! [ -e $i/device/drive ]; then
                        continue;
                fi;
                driver=$(basename $(readlink $i/device/driver))
                case $driver in
                        hostap*)
                                echo -- hostap,$i,$i-$driver
                                break;
                        ipw2?00)
                                echo -- $driver,$i,$i-$driver
                                break;
                        prism54)
                                echo prism54g,$i
                esac
        done

Which should generate a working set of source lines for kismet no matter
what order I plug the cards in.

It might also be handy to have a link between the two net devices, but
that's a patch for another day.

That patch is against 2.6.13-rc1-mm1.

-- Dave

Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---
 drivers/net/wireless/hostap/hostap.c     | 1 +
 drivers/net/wireless/hostap/hostap_cs.c  | 3 ++-
 drivers/net/wireless/hostap/hostap_hw.c  | 4 +++-
 drivers/net/wireless/hostap/hostap_pci.c | 3 ++-
 drivers/net/wireless/hostap/hostap_plx.c | 3 ++-
 5 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'drivers/net/wireless/hostap/hostap_pci.c')

diff --git a/drivers/net/wireless/hostap/hostap.c b/drivers/net/wireless/hostap/hostap.c
index 366cefbaca59..ea30ba806050 100644
--- a/drivers/net/wireless/hostap/hostap.c
+++ b/drivers/net/wireless/hostap/hostap.c
@@ -137,6 +137,7 @@ struct net_device * hostap_add_interface(struct local_info *local,
 	if (strchr(dev->name, '%'))
 		ret = dev_alloc_name(dev, dev->name);
 
+	SET_NETDEV_DEV(dev, mdev->class_dev.dev);
 	if (ret >= 0)
 		ret = register_netdevice(dev);
 
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index f915f0c75cf4..649502488d54 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -725,7 +725,8 @@ static int prism2_config(dev_link_t *link)
 	}
 
 	/* Need to allocate net_device before requesting IRQ handler */
-	dev = prism2_init_local_data(&prism2_pccard_funcs, 0);
+	dev = prism2_init_local_data(&prism2_pccard_funcs, 0,
+				     &handle_to_dev(link->handle));
 	if (dev == NULL)
 		goto failed;
 	link->priv = dev;
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index 039ef7f61bee..7572050db32d 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -3268,7 +3268,8 @@ static void prism2_clear_set_tim_queue(local_info_t *local)
 
 
 static struct net_device *
-prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx)
+prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,
+		       struct device *sdev)
 {
 	struct net_device *dev;
 	struct hostap_interface *iface;
@@ -3439,6 +3440,7 @@ while (0)
 
 	rtnl_lock();
 	ret = dev_alloc_name(dev, "wifi%d");
+	SET_NETDEV_DEV(dev, sdev);
 	if (ret >= 0)
 		ret = register_netdevice(dev);
 	rtnl_unlock();
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 3a208989333e..c4c7b2f2e8ac 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -308,7 +308,8 @@ static int prism2_pci_probe(struct pci_dev *pdev,
 	pci_set_master(pdev);
 #endif /* PRISM2_BUS_MASTER */
 
-	dev = prism2_init_local_data(&prism2_pci_funcs, cards_found);
+	dev = prism2_init_local_data(&prism2_pci_funcs, cards_found,
+				     &pdev->dev);
 	if (dev == NULL)
 		goto fail;
 	iface = netdev_priv(dev);
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index ec33501e094a..e29ac2271bd2 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -522,7 +522,8 @@ static int prism2_plx_probe(struct pci_dev *pdev,
 		 * not present; but are there really such cards in use(?) */
 	}
 
-	dev = prism2_init_local_data(&prism2_plx_funcs, cards_found);
+	dev = prism2_init_local_data(&prism2_plx_funcs, cards_found,
+				     &pdev->dev);
 	if (dev == NULL)
 		goto fail;
 	iface = netdev_priv(dev);
-- 
cgit v1.2.3


From f06ac319c05c6822f878f201ae80e54fbbe8be8c Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jkmaline@cc.hut.fi>
Date: Sat, 30 Jul 2005 12:50:00 -0700
Subject: [PATCH] hostap update

Add MODULE_VERSION information for the Host AP kernel modules and
update the version string to indicate which version of the external
Host AP driver is included in the kernel tree.

Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---
 drivers/net/wireless/hostap/hostap.c            | 1 +
 drivers/net/wireless/hostap/hostap_config.h     | 2 +-
 drivers/net/wireless/hostap/hostap_crypt_ccmp.c | 1 +
 drivers/net/wireless/hostap/hostap_crypt_tkip.c | 1 +
 drivers/net/wireless/hostap/hostap_crypt_wep.c  | 2 ++
 drivers/net/wireless/hostap/hostap_cs.c         | 1 +
 drivers/net/wireless/hostap/hostap_pci.c        | 1 +
 drivers/net/wireless/hostap/hostap_plx.c        | 1 +
 8 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'drivers/net/wireless/hostap/hostap_pci.c')

diff --git a/drivers/net/wireless/hostap/hostap.c b/drivers/net/wireless/hostap/hostap.c
index ea30ba806050..182891f1dd02 100644
--- a/drivers/net/wireless/hostap/hostap.c
+++ b/drivers/net/wireless/hostap/hostap.c
@@ -37,6 +37,7 @@
 MODULE_AUTHOR("Jouni Malinen");
 MODULE_DESCRIPTION("Host AP common routines");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
 
 /* Old hostap_crypt module is now part of hostap module. */
 #include "hostap_crypt.c"
diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/hostap/hostap_config.h
index fcf45781f4ad..0b526febd1a8 100644
--- a/drivers/net/wireless/hostap/hostap_config.h
+++ b/drivers/net/wireless/hostap/hostap_config.h
@@ -1,7 +1,7 @@
 #ifndef HOSTAP_CONFIG_H
 #define HOSTAP_CONFIG_H
 
-#define PRISM2_VERSION "CVS"
+#define PRISM2_VERSION "0.4.1-kernel"
 
 /* In the previous versions of Host AP driver, support for user space version
  * of IEEE 802.11 management (hostapd) used to be disabled in the default
diff --git a/drivers/net/wireless/hostap/hostap_crypt_ccmp.c b/drivers/net/wireless/hostap/hostap_crypt_ccmp.c
index e95bcc73dbf1..ad26aac2d5fe 100644
--- a/drivers/net/wireless/hostap/hostap_crypt_ccmp.c
+++ b/drivers/net/wireless/hostap/hostap_crypt_ccmp.c
@@ -36,6 +36,7 @@
 MODULE_AUTHOR("Jouni Malinen");
 MODULE_DESCRIPTION("Host AP crypt: CCMP");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
 
 
 #define AES_BLOCK_LEN 16
diff --git a/drivers/net/wireless/hostap/hostap_crypt_tkip.c b/drivers/net/wireless/hostap/hostap_crypt_tkip.c
index e8d56bc280aa..fcf1a014f4ac 100644
--- a/drivers/net/wireless/hostap/hostap_crypt_tkip.c
+++ b/drivers/net/wireless/hostap/hostap_crypt_tkip.c
@@ -38,6 +38,7 @@
 MODULE_AUTHOR("Jouni Malinen");
 MODULE_DESCRIPTION("Host AP crypt: TKIP");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
 
 
 struct hostap_tkip_data {
diff --git a/drivers/net/wireless/hostap/hostap_crypt_wep.c b/drivers/net/wireless/hostap/hostap_crypt_wep.c
index a6783e067f1a..66c403f17631 100644
--- a/drivers/net/wireless/hostap/hostap_crypt_wep.c
+++ b/drivers/net/wireless/hostap/hostap_crypt_wep.c
@@ -19,6 +19,7 @@
 #include <asm/string.h>
 
 #include "hostap_crypt.h"
+#include "hostap_config.h"
 
 #ifndef CONFIG_CRYPTO
 #error CONFIG_CRYPTO is required to build this module.
@@ -30,6 +31,7 @@
 MODULE_AUTHOR("Jouni Malinen");
 MODULE_DESCRIPTION("Host AP crypt: WEP");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
 
 
 struct prism2_wep_data {
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 36b80ce137bd..a5a6d6a966ee 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -32,6 +32,7 @@ MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "
 		   "cards (PC Card).");
 MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PC Card)");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
 
 
 static int ignore_cis_vcc;
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index c4c7b2f2e8ac..786c146f533e 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -31,6 +31,7 @@ MODULE_DESCRIPTION("Support for Intersil Prism2.5-based 802.11 wireless LAN "
 		   "PCI cards.");
 MODULE_SUPPORTED_DEVICE("Intersil Prism2.5-based WLAN PCI cards");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
 
 
 /* FIX: do we need mb/wmb/rmb with memory operations? */
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index e29ac2271bd2..c2f5b1f2b857 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -34,6 +34,7 @@ MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "
 		   "cards (PLX).");
 MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PLX)");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
 
 
 static int ignore_cis;
-- 
cgit v1.2.3


From ea3f1865f33bd328bf043f47492f401a42de5edb Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jkmaline@cc.hut.fi>
Date: Sun, 14 Aug 2005 19:08:40 -0700
Subject: [PATCH] hostap: Remove experimental PCI bus master/DMA code

PCI version of Prism2.5/3 has undocumented DMA support for TX/RX data,
but this seems to have some hardware bugs that prevent it from being
used properly for TX. RX side could possibly be made to work reliably.

Even though DMA support would be very useful for saving host CPU (from
about 40% to 5-10% when operating at maximum throughput), it seems to
be best to just remove this code finally. The implementation has
always been commented out by default and has received very limited
testing. The code may have already been broken number of times and I
don't have much interested in trying to verify whether it works or
not. Getting this out makes it easier to maintain the driver and
allows some cleanups that have been partly postponed because of this
experimental bus master/DMA code.

Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---
 drivers/net/wireless/hostap/hostap_common.h |   4 +-
 drivers/net/wireless/hostap/hostap_config.h |  31 ----
 drivers/net/wireless/hostap/hostap_hw.c     | 211 ++--------------------------
 drivers/net/wireless/hostap/hostap_ioctl.c  |  24 ----
 drivers/net/wireless/hostap/hostap_pci.c    |   4 -
 drivers/net/wireless/hostap/hostap_wlan.h   |  12 --
 6 files changed, 13 insertions(+), 273 deletions(-)

(limited to 'drivers/net/wireless/hostap/hostap_pci.c')

diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/hostap/hostap_common.h
index 3b79d9e95e6f..3f86263a08fd 100644
--- a/drivers/net/wireless/hostap/hostap_common.h
+++ b/drivers/net/wireless/hostap/hostap_common.h
@@ -343,8 +343,8 @@ enum {
 	PRISM2_PARAM_MONITOR_ALLOW_FCSERR = 16,
 	PRISM2_PARAM_HOST_ENCRYPT = 17,
 	PRISM2_PARAM_HOST_DECRYPT = 18,
-	PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX = 19,
-	PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX = 20,
+	/* PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX = 19, REMOVED 2005-08-14 */
+	/* PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX = 20, REMOVED 2005-08-14 */
 	PRISM2_PARAM_HOST_ROAMING = 21,
 	PRISM2_PARAM_BCRX_STA_KEY = 22,
 	PRISM2_PARAM_IEEE_802_1X = 23,
diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/hostap/hostap_config.h
index 0b526febd1a8..174068bffd82 100644
--- a/drivers/net/wireless/hostap/hostap_config.h
+++ b/drivers/net/wireless/hostap/hostap_config.h
@@ -13,37 +13,6 @@
 /* Maximum number of events handler per one interrupt */
 #define PRISM2_MAX_INTERRUPT_EVENTS 20
 
-/* Use PCI bus master to copy data to/from BAP (only available for
- * hostap_pci.o).
- *
- * Note! This is extremely experimental. PCI bus master is not supported by
- * Intersil and it seems to have some problems at least on TX path (see below).
- * The driver code for implementing bus master support is based on guessing
- * and experimenting suitable control bits and these might not be correct.
- * This code is included because using bus master makes a huge difference in
- * host CPU load (something like 40% host CPU usage to 5-10% when sending or
- * receiving at maximum throughput).
- *
- * Note2! Station firmware version 1.3.5 and primary firmware version 1.0.7
- * have some fixes for PCI corruption and these (or newer) versions are
- * recommended especially when using bus mastering.
- *
- * NOTE: PCI bus mastering code has not been updated for long time and it is
- * not likely to compile and it will _not_ work as is. Only enable this if you
- * are prepared to first fix the implementation..
- */
-/* #define PRISM2_BUS_MASTER */
-
-#ifdef PRISM2_BUS_MASTER
-
-/* PCI bus master implementation seems to be broken in current
- * hardware/firmware versions. Enable this to use enable command to fix
- * something before starting bus master operation on TX path. This will add
- * some latency and an extra interrupt to each TX packet. */
-#define PRISM2_ENABLE_BEFORE_TX_BUS_MASTER
-
-#endif /* PRISM2_BUS_MASTER */
-
 /* Include code for downloading firmware images into volatile RAM. */
 #define PRISM2_DOWNLOAD_SUPPORT
 
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index dc31f5351b36..30c215106714 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -83,18 +83,6 @@ static int dtim_period[MAX_PARM_DEVICES] = { 1, DEF_INTS };
 module_param_array(dtim_period, int, NULL, 0444);
 MODULE_PARM_DESC(dtim_period, "DTIM period");
 
-#if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER)
-static int bus_master_threshold_rx[MAX_PARM_DEVICES] = { 100, DEF_INTS };
-module_param_array(bus_master_threshold_rx, int, NULL, 0444);
-MODULE_PARM_DESC(bus_master_threshold_rx, "Packet length threshold for using "
-		 "PCI bus master on RX");
-
-static int bus_master_threshold_tx[MAX_PARM_DEVICES] = { 100, DEF_INTS };
-module_param_array(bus_master_threshold_tx, int, NULL, 0444);
-MODULE_PARM_DESC(bus_master_threshold_tx, "Packet length threshold for using "
-		 "PCI bus master on TX");
-#endif /* PRISM2_PCI and PRISM2_BUS_MASTER */
-
 static char dev_template[16] = "wlan%d";
 module_param_string(dev_template, dev_template, sizeof(dev_template), 0444);
 MODULE_PARM_DESC(dev_template, "Prefix for network device name (default: "
@@ -107,12 +95,6 @@ MODULE_PARM_DESC(dev_template, "Prefix for network device name (default: "
 #define EXTRA_EVENTS_WTERR HFA384X_EV_WTERR
 #endif
 
-#if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER)
-#define EXTRA_EVENTS_BUS_MASTER (HFA384X_EV_PCI_M0 | HFA384X_EV_PCI_M1)
-#else
-#define EXTRA_EVENTS_BUS_MASTER 0
-#endif
-
 /* Events that will be using BAP0 */
 #define HFA384X_BAP0_EVENTS \
 	(HFA384X_EV_TXEXC | HFA384X_EV_RX | HFA384X_EV_INFO | HFA384X_EV_TX)
@@ -121,7 +103,7 @@ MODULE_PARM_DESC(dev_template, "Prefix for network device name (default: "
 #define HFA384X_EVENT_MASK \
 	(HFA384X_BAP0_EVENTS | HFA384X_EV_ALLOC | HFA384X_EV_INFDROP | \
 	HFA384X_EV_CMD | HFA384X_EV_TICK | \
-	EXTRA_EVENTS_WTERR | EXTRA_EVENTS_BUS_MASTER)
+	EXTRA_EVENTS_WTERR)
 
 /* Default TX control flags: use 802.11 headers and request interrupt for
  * failed transmits. Frames that request ACK callback, will add
@@ -1827,34 +1809,6 @@ static int prism2_transmit(struct net_device *dev, int idx)
 }
 
 
-#if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER)
-/* Called only from hardware IRQ */
-static void prism2_tx_cb(struct net_device *dev, void *context,
-			 u16 resp0, u16 res)
-{
-	struct hostap_interface *iface;
-	local_info_t *local;
-	unsigned long addr;
-	int buf_len = (int) context;
-
-	iface = netdev_priv(dev);
-	local = iface->local;
-
-	if (res) {
-		printk(KERN_DEBUG "%s: prism2_tx_cb - res=0x%02x\n",
-		       dev->name, res);
-		return;
-	}
-
-	addr = virt_to_phys(local->bus_m0_buf);
-	HFA384X_OUTW((addr & 0xffff0000) >> 16, HFA384X_PCI_M0_ADDRH_OFF);
-	HFA384X_OUTW(addr & 0x0000ffff, HFA384X_PCI_M0_ADDRL_OFF);
-	HFA384X_OUTW(buf_len / 2, HFA384X_PCI_M0_LEN_OFF);
-	HFA384X_OUTW(HFA384X_PCI_CTL_TO_BAP, HFA384X_PCI_M0_CTL_OFF);
-}
-#endif /* PRISM2_PCI and PRISM2_BUS_MASTER */
-
-
 /* Send IEEE 802.11 frame (convert the header into Prism2 TX descriptor and
  * send the payload with this descriptor) */
 /* Called only from software IRQ */
@@ -1920,53 +1874,6 @@ static int prism2_tx_80211(struct sk_buff *skb, struct net_device *dev)
 	spin_lock(&local->baplock);
 	res = hfa384x_setup_bap(dev, BAP0, local->txfid[idx], 0);
 
-#if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER)
-	if (!res && skb->len >= local->bus_master_threshold_tx) {
-		u8 *pos;
-		int buf_len;
-
-		local->bus_m0_tx_idx = idx;
-
-		/* FIX: BAP0 should be locked during bus master transfer, but
-		 * baplock with BH's disabled is not OK for this; netif queue
-		 * stopping is not enough since BAP0 is used also for RID
-		 * read/write */
-
-		/* stop the queue for the time that bus mastering on BAP0 is
-		 * in use */
-		netif_stop_queue(dev);
-
-		spin_unlock(&local->baplock);
-
-		/* Copy frame data to bus_m0_buf */
-		pos = local->bus_m0_buf;
-		memcpy(pos, &txdesc, sizeof(txdesc));
-		pos += sizeof(txdesc);
-		memcpy(pos, skb->data + hdr_len, skb->len - hdr_len);
-		pos += skb->len - hdr_len;
-		buf_len = pos - local->bus_m0_buf;
-		if (buf_len & 1)
-			buf_len++;
-
-#ifdef PRISM2_ENABLE_BEFORE_TX_BUS_MASTER
-		/* Any RX packet seems to break something with TX bus
-		 * mastering; enable command is enough to fix this.. */
-		if (hfa384x_cmd_callback(dev, HFA384X_CMDCODE_ENABLE, 0,
-					 prism2_tx_cb, (long) buf_len)) {
-			printk(KERN_DEBUG "%s: TX: enable port0 failed\n",
-			       dev->name);
-		}
-#else /* PRISM2_ENABLE_BEFORE_TX_BUS_MASTER */
-		prism2_tx_cb(dev, (void *) buf_len, 0, 0);
-#endif /* PRISM2_ENABLE_BEFORE_TX_BUS_MASTER */
-
-		/* Bus master transfer will be started from command completion
-		 * event handler and TX handling will be finished by calling
-		 * prism2_transmit() from bus master event handler */
-		goto tx_stats;
-	}
-#endif /* PRISM2_PCI and PRISM2_BUS_MASTER */
-
 	if (!res)
 		res = hfa384x_to_bap(dev, BAP0, &txdesc, sizeof(txdesc));
 	if (!res)
@@ -2107,50 +2014,18 @@ static void prism2_rx(local_info_t *local)
 	skb->dev = dev;
 	memcpy(skb_put(skb, hdr_len), &rxdesc, hdr_len);
 
-#if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER)
-	if (len >= local->bus_master_threshold_rx) {
-		unsigned long addr;
-
-		hfa384x_events_no_bap1(dev);
-
-		local->rx_skb = skb;
-		/* Internal BAP0 offset points to the byte following rxdesc;
-		 * copy rest of the data using bus master */
-		addr = virt_to_phys(skb_put(skb, len));
-		HFA384X_OUTW((addr & 0xffff0000) >> 16,
-			     HFA384X_PCI_M0_ADDRH_OFF);
-		HFA384X_OUTW(addr & 0x0000ffff, HFA384X_PCI_M0_ADDRL_OFF);
-		if (len & 1)
-			len++;
-		HFA384X_OUTW(len / 2, HFA384X_PCI_M0_LEN_OFF);
-		HFA384X_OUTW(HFA384X_PCI_CTL_FROM_BAP, HFA384X_PCI_M0_CTL_OFF);
-
-		/* pci_bus_m1 event will be generated when data transfer is
-		 * complete and the frame will then be added to rx_list and
-		 * rx_tasklet is scheduled */
-		rx_pending = 1;
-
-		/* Have to release baplock before returning, although BAP0
-		 * should really not be used before DMA transfer has been
-		 * completed. */
-		spin_unlock(&local->baplock);
-	} else
-#endif /* PRISM2_PCI and PRISM2_BUS_MASTER */
-	{
-		if (len > 0)
-			res = hfa384x_from_bap(dev, BAP0, skb_put(skb, len),
-					       len);
-		spin_unlock(&local->baplock);
-		if (res) {
-			printk(KERN_DEBUG "%s: RX failed to read "
-			       "frame data\n", dev->name);
-			goto rx_dropped;
-		}
-
-		skb_queue_tail(&local->rx_list, skb);
-		tasklet_schedule(&local->rx_tasklet);
+	if (len > 0)
+		res = hfa384x_from_bap(dev, BAP0, skb_put(skb, len), len);
+	spin_unlock(&local->baplock);
+	if (res) {
+		printk(KERN_DEBUG "%s: RX failed to read "
+		       "frame data\n", dev->name);
+		goto rx_dropped;
 	}
 
+	skb_queue_tail(&local->rx_list, skb);
+	tasklet_schedule(&local->rx_tasklet);
+
  rx_exit:
 	prism2_callback(local, PRISM2_CALLBACK_RX_END);
 	if (!rx_pending) {
@@ -2654,36 +2529,6 @@ static void hostap_bap_tasklet(unsigned long data)
 }
 
 
-#if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER)
-/* Called only from hardware IRQ */
-static void prism2_bus_master_ev(struct net_device *dev, int bap)
-{
-	struct hostap_interface *iface;
-	local_info_t *local;
-
-	iface = netdev_priv(dev);
-	local = iface->local;
-
-	if (bap == BAP1) {
-		/* FIX: frame payload was DMA'd to skb->data; might need to
-		 * invalidate data cache for that memory area */
-		skb_queue_tail(&local->rx_list, local->rx_skb);
-		tasklet_schedule(&local->rx_tasklet);
-		HFA384X_OUTW(HFA384X_EV_RX, HFA384X_EVACK_OFF);
-	} else {
-		if (prism2_transmit(dev, local->bus_m0_tx_idx)) {
-			printk(KERN_DEBUG "%s: prism2_transmit() failed "
-			       "when called from bus master event\n",
-			       dev->name);
-			local->intransmitfid[local->bus_m0_tx_idx] =
-				PRISM2_TXFID_EMPTY;
-			schedule_work(&local->reset_queue);
-		}
-	}
-}
-#endif /* PRISM2_PCI and PRISM2_BUS_MASTER */
-
-
 /* Called only from hardware IRQ */
 static void prism2_infdrop(struct net_device *dev)
 {
@@ -2852,21 +2697,6 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 			HFA384X_OUTW(HFA384X_EV_TICK, HFA384X_EVACK_OFF);
 		}
 
-#if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER)
-		if (ev & HFA384X_EV_PCI_M0) {
-			prism2_bus_master_ev(dev, BAP0);
-			HFA384X_OUTW(HFA384X_EV_PCI_M0, HFA384X_EVACK_OFF);
-		}
-
-		if (ev & HFA384X_EV_PCI_M1) {
-			/* previous RX has been copied can be ACKed now */
-			HFA384X_OUTW(HFA384X_EV_RX, HFA384X_EVACK_OFF);
-
-			prism2_bus_master_ev(dev, BAP1);
-			HFA384X_OUTW(HFA384X_EV_PCI_M1, HFA384X_EVACK_OFF);
-		}
-#endif /* PRISM2_PCI and PRISM2_BUS_MASTER */
-
 		if (ev & HFA384X_EV_ALLOC) {
 			prism2_alloc_ev(dev);
 			HFA384X_OUTW(HFA384X_EV_ALLOC, HFA384X_EVACK_OFF);
@@ -3309,13 +3139,6 @@ prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,
 	local->io_debug_enabled = 1;
 #endif /* PRISM2_IO_DEBUG */
 
-#if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER)
-	local->bus_m0_buf = (u8 *) kmalloc(sizeof(struct hfa384x_tx_frame) +
-					   PRISM2_DATA_MAXLEN, GFP_DMA);
-	if (local->bus_m0_buf == NULL)
-		goto fail;
-#endif /* PRISM2_PCI and PRISM2_BUS_MASTER */
-
 	local->func = funcs;
 	local->func->cmd = hfa384x_cmd;
 	local->func->read_regs = hfa384x_read_regs;
@@ -3376,12 +3199,6 @@ prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,
 	local->auth_algs = PRISM2_AUTH_OPEN | PRISM2_AUTH_SHARED_KEY;
 	local->sram_type = -1;
 	local->scan_channel_mask = 0xffff;
-#if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER)
-	local->bus_master_threshold_rx = GET_INT_PARM(bus_master_threshold_rx,
-						      card_idx);
-	local->bus_master_threshold_tx = GET_INT_PARM(bus_master_threshold_tx,
-						      card_idx);
-#endif /* PRISM2_PCI and PRISM2_BUS_MASTER */
 
 	/* Initialize task queue structures */
 	INIT_WORK(&local->reset_queue, handle_reset_queue, local);
@@ -3462,9 +3279,6 @@ while (0)
 	return dev;
 
  fail:
-#if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER)
-	kfree(local->bus_m0_buf);
-#endif /* PRISM2_PCI and PRISM2_BUS_MASTER */
 	free_netdev(dev);
 	return NULL;
 }
@@ -3586,9 +3400,6 @@ static void prism2_free_local_data(struct net_device *dev)
 		kfree(bss);
 	}
 
-#if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER)
-	kfree(local->bus_m0_buf);
-#endif /* PRISM2_PCI and PRISM2_BUS_MASTER */
 	kfree(local->pda);
 	kfree(local->last_scan_results);
 	kfree(local->generic_elem);
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index cfe127a10850..267f68b4d7fd 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -2239,14 +2239,6 @@ static const struct iw_priv_args prism2_priv[] = {
 	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "host_decrypt" },
 	{ PRISM2_PARAM_HOST_DECRYPT,
 	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethost_decrypt" },
-	{ PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX,
-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "busmaster_rx" },
-	{ PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX,
-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getbusmaster_rx" },
-	{ PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX,
-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "busmaster_tx" },
-	{ PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX,
-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getbusmaster_tx" },
 #ifndef PRISM2_NO_STATION_MODES
 	{ PRISM2_PARAM_HOST_ROAMING,
 	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "host_roaming" },
@@ -2495,14 +2487,6 @@ static int prism2_ioctl_priv_prism2_param(struct net_device *dev,
 			ret = -EINVAL;
 		break;
 
-	case PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX:
-		local->bus_master_threshold_rx = value;
-		break;
-
-	case PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX:
-		local->bus_master_threshold_tx = value;
-		break;
-
 #ifndef PRISM2_NO_STATION_MODES
 	case PRISM2_PARAM_HOST_ROAMING:
 		if (value < 0 || value > 2) {
@@ -2799,14 +2783,6 @@ static int prism2_ioctl_priv_get_prism2_param(struct net_device *dev,
 		*param = local->host_decrypt;
 		break;
 
-	case PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX:
-		*param = local->bus_master_threshold_rx;
-		break;
-
-	case PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX:
-		*param = local->bus_master_threshold_tx;
-		break;
-
 	case PRISM2_PARAM_HOST_ROAMING:
 		*param = local->host_roaming;
 		break;
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 786c146f533e..79074b3d10d7 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -305,10 +305,6 @@ static int prism2_pci_probe(struct pci_dev *pdev,
 		goto fail;
 	}
 
-#ifdef PRISM2_BUS_MASTER
-	pci_set_master(pdev);
-#endif /* PRISM2_BUS_MASTER */
-
 	dev = prism2_init_local_data(&prism2_pci_funcs, cards_found,
 				     &pdev->dev);
 	if (dev == NULL)
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index 6f5bea8a5c23..56416b43e414 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -787,10 +787,6 @@ struct local_info {
 
 	struct prism2_helper_functions *func;
 
-	int bus_master_threshold_tx;
-	int bus_master_threshold_rx;
-	u8 *bus_m1_buf;
-
 	u8 *pda;
 	int fw_ap;
 #define PRISM2_FW_VER(major, minor, variant) \
@@ -897,14 +893,6 @@ struct local_info {
 
 #ifdef PRISM2_PCI
 	void __iomem *mem_start;
-#ifdef PRISM2_BUS_MASTER
-	/* bus master for BAP0 (TX) */
-	int bus_m0_tx_idx;
-	u8 *bus_m0_buf;
-
-	/* bus master for BAP1 (RX) */
-	struct sk_buff *rx_skb;
-#endif /* PRISM2_BUS_MASTER */
 #endif /* PRISM2_PCI */
 
 	/* NOTE! Do not add common entries here after hardware version
-- 
cgit v1.2.3


From 67e0e473fb54e7657f6604236e42ef07fd7a2768 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jkmaline@cc.hut.fi>
Date: Sun, 14 Aug 2005 19:08:41 -0700
Subject: [PATCH] hostap: Use void *hw_priv instead of #ifdef in local data

Replace hardware model specific #ifdef's in struct local_info with
void *hw_priv that is pointing to cs/pci/plx specific data
structure. This removes unneeded #ifdef's and as such, is a step
towards making it possible to share objects for hostap_hw.c and
hostap_download.c with cs/pci/plx drivers without having to compile
and link the same code separately for each one.

Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---
 drivers/net/wireless/hostap/hostap_cs.c   | 120 ++++++++++++++++++++----------
 drivers/net/wireless/hostap/hostap_pci.c  |  58 ++++++++++-----
 drivers/net/wireless/hostap/hostap_plx.c  |  63 +++++++++++-----
 drivers/net/wireless/hostap/hostap_wlan.h |  23 +-----
 4 files changed, 166 insertions(+), 98 deletions(-)

(limited to 'drivers/net/wireless/hostap/hostap_pci.c')

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 3210c99694e6..70242459d57a 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -40,6 +40,14 @@ module_param(ignore_cis_vcc, int, 0444);
 MODULE_PARM_DESC(ignore_cis_vcc, "Ignore broken CIS VCC entry");
 
 
+/* struct local_info::hw_priv */
+struct hostap_cs_priv {
+	dev_node_t node;
+	dev_link_t *link;
+	int sandisk_connectplus;
+};
+
+
 #ifdef PRISM2_IO_DEBUG
 
 static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)
@@ -203,8 +211,9 @@ static int prism2_event(event_t event, int priority,
 
 static int prism2_pccard_card_present(local_info_t *local)
 {
-	if (local->link != NULL &&
-	    ((local->link->state & (DEV_PRESENT | DEV_CONFIG)) ==
+	struct hostap_cs_priv *hw_priv = local->hw_priv;
+	if (hw_priv->link != NULL &&
+	    ((hw_priv->link->state & (DEV_PRESENT | DEV_CONFIG)) ==
 	     (DEV_PRESENT | DEV_CONFIG)))
 		return 1;
 	return 0;
@@ -224,12 +233,14 @@ static void sandisk_set_iobase(local_info_t *local)
 {
 	int res;
 	conf_reg_t reg;
+	struct hostap_cs_priv *hw_priv = local->hw_priv;
 
 	reg.Function = 0;
 	reg.Action = CS_WRITE;
 	reg.Offset = 0x10; /* 0x3f0 IO base 1 */
-	reg.Value = local->link->io.BasePort1 & 0x00ff;
-	res = pcmcia_access_configuration_register(local->link->handle, &reg);
+	reg.Value = hw_priv->link->io.BasePort1 & 0x00ff;
+	res = pcmcia_access_configuration_register(hw_priv->link->handle,
+						   &reg);
 	if (res != CS_SUCCESS) {
 		printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 0 -"
 		       " res=%d\n", res);
@@ -239,8 +250,9 @@ static void sandisk_set_iobase(local_info_t *local)
 	reg.Function = 0;
 	reg.Action = CS_WRITE;
 	reg.Offset = 0x12; /* 0x3f2 IO base 2 */
-	reg.Value = (local->link->io.BasePort1 & 0xff00) >> 8;
-	res = pcmcia_access_configuration_register(local->link->handle, &reg);
+	reg.Value = (hw_priv->link->io.BasePort1 & 0xff00) >> 8;
+	res = pcmcia_access_configuration_register(hw_priv->link->handle,
+						   &reg);
 	if (res != CS_SUCCESS) {
 		printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 1 -"
 		       " res=%d\n", res);
@@ -272,8 +284,9 @@ static int sandisk_enable_wireless(struct net_device *dev)
 	tuple_t tuple;
 	cisparse_t *parse = NULL;
 	u_char buf[64];
+	struct hostap_cs_priv *hw_priv = local->hw_priv;
 
-	if (local->link->io.NumPorts1 < 0x42) {
+	if (hw_priv->link->io.NumPorts1 < 0x42) {
 		/* Not enough ports to be SanDisk multi-function card */
 		ret = -ENODEV;
 		goto done;
@@ -290,9 +303,9 @@ static int sandisk_enable_wireless(struct net_device *dev)
 	tuple.TupleData = buf;
 	tuple.TupleDataMax = sizeof(buf);
 	tuple.TupleOffset = 0;
-	if (pcmcia_get_first_tuple(local->link->handle, &tuple) ||
-	    pcmcia_get_tuple_data(local->link->handle, &tuple) ||
-	    pcmcia_parse_tuple(local->link->handle, &tuple, parse) ||
+	if (pcmcia_get_first_tuple(hw_priv->link->handle, &tuple) ||
+	    pcmcia_get_tuple_data(hw_priv->link->handle, &tuple) ||
+	    pcmcia_parse_tuple(hw_priv->link->handle, &tuple, parse) ||
 	    parse->manfid.manf != 0xd601 || parse->manfid.card != 0x0101) {
 		/* No SanDisk manfid found */
 		ret = -ENODEV;
@@ -300,9 +313,9 @@ static int sandisk_enable_wireless(struct net_device *dev)
 	}
 
 	tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
-	if (pcmcia_get_first_tuple(local->link->handle, &tuple) ||
-	    pcmcia_get_tuple_data(local->link->handle, &tuple) ||
-	    pcmcia_parse_tuple(local->link->handle, &tuple, parse) ||
+	if (pcmcia_get_first_tuple(hw_priv->link->handle, &tuple) ||
+	    pcmcia_get_tuple_data(hw_priv->link->handle, &tuple) ||
+	    pcmcia_parse_tuple(hw_priv->link->handle, &tuple, parse) ||
 		parse->longlink_mfc.nfn < 2) {
 		/* No multi-function links found */
 		ret = -ENODEV;
@@ -311,13 +324,14 @@ static int sandisk_enable_wireless(struct net_device *dev)
 
 	printk(KERN_DEBUG "%s: Multi-function SanDisk ConnectPlus detected"
 	       " - using vendor-specific initialization\n", dev->name);
-	local->sandisk_connectplus = 1;
+	hw_priv->sandisk_connectplus = 1;
 
 	reg.Function = 0;
 	reg.Action = CS_WRITE;
 	reg.Offset = CISREG_COR;
 	reg.Value = COR_SOFT_RESET;
-	res = pcmcia_access_configuration_register(local->link->handle, &reg);
+	res = pcmcia_access_configuration_register(hw_priv->link->handle,
+						   &reg);
 	if (res != CS_SUCCESS) {
 		printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
 		       dev->name, res);
@@ -333,7 +347,8 @@ static int sandisk_enable_wireless(struct net_device *dev)
 	 * will be enabled during the first cor_sreset call.
 	 */
 	reg.Value = COR_LEVEL_REQ | 0x8 | COR_ADDR_DECODE | COR_FUNC_ENA;
-	res = pcmcia_access_configuration_register(local->link->handle, &reg);
+	res = pcmcia_access_configuration_register(hw_priv->link->handle,
+						   &reg);
 	if (res != CS_SUCCESS) {
 		printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
 		       dev->name, res);
@@ -358,6 +373,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
 {
 	int res;
 	conf_reg_t reg;
+	struct hostap_cs_priv *hw_priv = local->hw_priv;
 
 	if (!prism2_pccard_card_present(local))
 	       return;
@@ -366,7 +382,8 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
 	reg.Action = CS_READ;
 	reg.Offset = CISREG_COR;
 	reg.Value = 0;
-	res = pcmcia_access_configuration_register(local->link->handle, &reg);
+	res = pcmcia_access_configuration_register(hw_priv->link->handle,
+						   &reg);
 	if (res != CS_SUCCESS) {
 		printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 1 (%d)\n",
 		       res);
@@ -377,28 +394,30 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
 
 	reg.Action = CS_WRITE;
 	reg.Value |= COR_SOFT_RESET;
-	res = pcmcia_access_configuration_register(local->link->handle, &reg);
+	res = pcmcia_access_configuration_register(hw_priv->link->handle,
+						   &reg);
 	if (res != CS_SUCCESS) {
 		printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 2 (%d)\n",
 		       res);
 		return;
 	}
 
-	mdelay(local->sandisk_connectplus ? 5 : 2);
+	mdelay(hw_priv->sandisk_connectplus ? 5 : 2);
 
 	reg.Value &= ~COR_SOFT_RESET;
-	if (local->sandisk_connectplus)
+	if (hw_priv->sandisk_connectplus)
 		reg.Value |= COR_IREQ_ENA;
-	res = pcmcia_access_configuration_register(local->link->handle, &reg);
+	res = pcmcia_access_configuration_register(hw_priv->link->handle,
+						   &reg);
 	if (res != CS_SUCCESS) {
 		printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 3 (%d)\n",
 		       res);
 		return;
 	}
 
-	mdelay(local->sandisk_connectplus ? 5 : 2);
+	mdelay(hw_priv->sandisk_connectplus ? 5 : 2);
 
-	if (local->sandisk_connectplus)
+	if (hw_priv->sandisk_connectplus)
 		sandisk_set_iobase(local);
 }
 
@@ -408,11 +427,12 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
 	int res;
 	conf_reg_t reg;
 	int old_cor;
+	struct hostap_cs_priv *hw_priv = local->hw_priv;
 
 	if (!prism2_pccard_card_present(local))
 	       return;
 
-	if (local->sandisk_connectplus) {
+	if (hw_priv->sandisk_connectplus) {
 		sandisk_write_hcr(local, hcr);
 		return;
 	}
@@ -421,7 +441,8 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
 	reg.Action = CS_READ;
 	reg.Offset = CISREG_COR;
 	reg.Value = 0;
-	res = pcmcia_access_configuration_register(local->link->handle, &reg);
+	res = pcmcia_access_configuration_register(hw_priv->link->handle,
+						   &reg);
 	if (res != CS_SUCCESS) {
 		printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 1 "
 		       "(%d)\n", res);
@@ -433,7 +454,8 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
 
 	reg.Action = CS_WRITE;
 	reg.Value |= COR_SOFT_RESET;
-	res = pcmcia_access_configuration_register(local->link->handle, &reg);
+	res = pcmcia_access_configuration_register(hw_priv->link->handle,
+						   &reg);
 	if (res != CS_SUCCESS) {
 		printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 2 "
 		       "(%d)\n", res);
@@ -446,7 +468,8 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
 	reg.Action = CS_WRITE;
 	reg.Value = hcr;
 	reg.Offset = CISREG_CCSR;
-	res = pcmcia_access_configuration_register(local->link->handle, &reg);
+	res = pcmcia_access_configuration_register(hw_priv->link->handle,
+						   &reg);
 	if (res != CS_SUCCESS) {
 		printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 3 "
 		       "(%d)\n", res);
@@ -457,7 +480,8 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
 	reg.Action = CS_WRITE;
 	reg.Offset = CISREG_COR;
 	reg.Value = old_cor & ~COR_SOFT_RESET;
-	res = pcmcia_access_configuration_register(local->link->handle, &reg);
+	res = pcmcia_access_configuration_register(hw_priv->link->handle,
+						   &reg);
 	if (res != CS_SUCCESS) {
 		printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 4 "
 		       "(%d)\n", res);
@@ -470,23 +494,29 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
 
 static int prism2_pccard_dev_open(local_info_t *local)
 {
-	local->link->open++;
+	struct hostap_cs_priv *hw_priv = local->hw_priv;
+	hw_priv->link->open++;
 	return 0;
 }
 
 
 static int prism2_pccard_dev_close(local_info_t *local)
 {
-	if (local == NULL || local->link == NULL)
+	struct hostap_cs_priv *hw_priv;
+
+	if (local == NULL || local->hw_priv == NULL)
+		return 1;
+	hw_priv = local->hw_priv;
+	if (hw_priv->link == NULL)
 		return 1;
 
-	if (!local->link->open) {
+	if (!hw_priv->link->open) {
 		printk(KERN_WARNING "%s: prism2_pccard_dev_close(): "
 		       "link not open?!\n", local->dev->name);
 		return 1;
 	}
 
-	local->link->open--;
+	hw_priv->link->open--;
 
 	return 0;
 }
@@ -567,8 +597,13 @@ static void prism2_detach(dev_link_t *link)
 	*linkp = link->next;
 	/* release net devices */
 	if (link->priv) {
-		prism2_free_local_data((struct net_device *) link->priv);
-
+		struct net_device *dev;
+		struct hostap_interface *iface;
+		dev = link->priv;
+		iface = netdev_priv(dev);
+		kfree(iface->local->hw_priv);
+		iface->local->hw_priv = NULL;
+		prism2_free_local_data(dev);
 	}
 	kfree(link);
 }
@@ -601,14 +636,19 @@ static int prism2_config(dev_link_t *link)
 	u_char buf[64];
 	config_info_t conf;
 	cistpl_cftable_entry_t dflt = { 0 };
+	struct hostap_cs_priv *hw_priv;
 
 	PDEBUG(DEBUG_FLOW, "prism2_config()\n");
 
 	parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
-	if (parse == NULL) {
+	hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
+	if (parse == NULL || hw_priv == NULL) {
+		kfree(parse);
+		kfree(hw_priv);
 		ret = -ENOMEM;
 		goto failed;
 	}
+	memset(hw_priv, 0, sizeof(*hw_priv));
 
 	tuple.DesiredTuple = CISTPL_CONFIG;
 	tuple.Attributes = 0;
@@ -779,9 +819,10 @@ static int prism2_config(dev_link_t *link)
 
 	iface = netdev_priv(dev);
 	local = iface->local;
-	local->link = link;
-	strcpy(local->node.dev_name, dev->name);
-	link->dev = &local->node;
+	local->hw_priv = hw_priv;
+	hw_priv->link = link;
+	strcpy(hw_priv->node.dev_name, dev->name);
+	link->dev = &hw_priv->node;
 
 	local->shutdown = 0;
 
@@ -791,7 +832,7 @@ static int prism2_config(dev_link_t *link)
 	if (!ret) {
 		ret = hostap_hw_ready(dev);
 		if (ret == 0 && local->ddev)
-			strcpy(local->node.dev_name, local->ddev->name);
+			strcpy(hw_priv->node.dev_name, local->ddev->name);
 	}
 	kfree(parse);
 	return ret;
@@ -801,6 +842,7 @@ static int prism2_config(dev_link_t *link)
 
  failed:
 	kfree(parse);
+	kfree(hw_priv);
 	prism2_release((u_long)link);
 	return ret;
 }
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 79074b3d10d7..165f1450da57 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -34,6 +34,12 @@ MODULE_LICENSE("GPL");
 MODULE_VERSION(PRISM2_VERSION);
 
 
+/* struct local_info::hw_priv */
+struct hostap_pci_priv {
+	void __iomem *mem_start;
+};
+
+
 /* FIX: do we need mb/wmb/rmb with memory operations? */
 
 
@@ -61,7 +67,7 @@ static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)
 
 	spin_lock_irqsave(&local->lock, flags);
 	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTB, a, v);
-	writeb(v, local->mem_start + a);
+	writeb(v, hw_priv->mem_start + a);
 	spin_unlock_irqrestore(&local->lock, flags);
 }
 
@@ -76,7 +82,7 @@ static inline u8 hfa384x_inb_debug(struct net_device *dev, int a)
 	local = iface->local;
 
 	spin_lock_irqsave(&local->lock, flags);
-	v = readb(local->mem_start + a);
+	v = readb(hw_priv->mem_start + a);
 	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INB, a, v);
 	spin_unlock_irqrestore(&local->lock, flags);
 	return v;
@@ -93,7 +99,7 @@ static inline void hfa384x_outw_debug(struct net_device *dev, int a, u16 v)
 
 	spin_lock_irqsave(&local->lock, flags);
 	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTW, a, v);
-	writew(v, local->mem_start + a);
+	writew(v, hw_priv->mem_start + a);
 	spin_unlock_irqrestore(&local->lock, flags);
 }
 
@@ -108,7 +114,7 @@ static inline u16 hfa384x_inw_debug(struct net_device *dev, int a)
 	local = iface->local;
 
 	spin_lock_irqsave(&local->lock, flags);
-	v = readw(local->mem_start + a);
+	v = readw(hw_priv->mem_start + a);
 	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INW, a, v);
 	spin_unlock_irqrestore(&local->lock, flags);
 	return v;
@@ -126,37 +132,37 @@ static inline u16 hfa384x_inw_debug(struct net_device *dev, int a)
 static inline void hfa384x_outb(struct net_device *dev, int a, u8 v)
 {
 	struct hostap_interface *iface;
-	local_info_t *local;
+	struct hostap_pci_priv *hw_priv;
 	iface = netdev_priv(dev);
-	local = iface->local;
-	writeb(v, local->mem_start + a);
+	hw_priv = iface->local->hw_priv;
+	writeb(v, hw_priv->mem_start + a);
 }
 
 static inline u8 hfa384x_inb(struct net_device *dev, int a)
 {
 	struct hostap_interface *iface;
-	local_info_t *local;
+	struct hostap_pci_priv *hw_priv;
 	iface = netdev_priv(dev);
-	local = iface->local;
-	return readb(local->mem_start + a);
+	hw_priv = iface->local->hw_priv;
+	return readb(hw_priv->mem_start + a);
 }
 
 static inline void hfa384x_outw(struct net_device *dev, int a, u16 v)
 {
 	struct hostap_interface *iface;
-	local_info_t *local;
+	struct hostap_pci_priv *hw_priv;
 	iface = netdev_priv(dev);
-	local = iface->local;
-	writew(v, local->mem_start + a);
+	hw_priv = iface->local->hw_priv;
+	writew(v, hw_priv->mem_start + a);
 }
 
 static inline u16 hfa384x_inw(struct net_device *dev, int a)
 {
 	struct hostap_interface *iface;
-	local_info_t *local;
+	struct hostap_pci_priv *hw_priv;
 	iface = netdev_priv(dev);
-	local = iface->local;
-	return readw(local->mem_start + a);
+	hw_priv = iface->local->hw_priv;
+	return readw(hw_priv->mem_start + a);
 }
 
 #define HFA384X_OUTB(v,a) hfa384x_outb(dev, (a), (v))
@@ -288,6 +294,12 @@ static int prism2_pci_probe(struct pci_dev *pdev,
 	static int cards_found /* = 0 */;
 	int irq_registered = 0;
 	struct hostap_interface *iface;
+	struct hostap_pci_priv *hw_priv;
+
+	hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
+	if (hw_priv == NULL)
+		return -ENOMEM;
+	memset(hw_priv, 0, sizeof(*hw_priv));
 
 	if (pci_enable_device(pdev))
 		return -EIO;
@@ -311,10 +323,11 @@ static int prism2_pci_probe(struct pci_dev *pdev,
 		goto fail;
 	iface = netdev_priv(dev);
 	local = iface->local;
+	local->hw_priv = hw_priv;
 	cards_found++;
 
         dev->irq = pdev->irq;
-        local->mem_start = mem;
+        hw_priv->mem_start = mem;
 
 	prism2_pci_cor_sreset(local);
 
@@ -339,6 +352,8 @@ static int prism2_pci_probe(struct pci_dev *pdev,
 	return hostap_hw_ready(dev);
 
  fail:
+	kfree(hw_priv);
+
 	if (irq_registered && dev)
 		free_irq(dev->irq, dev);
 
@@ -349,6 +364,9 @@ static int prism2_pci_probe(struct pci_dev *pdev,
 
  err_out_disable:
 	pci_disable_device(pdev);
+	kfree(hw_priv);
+	if (local)
+		local->hw_priv = NULL;
 	prism2_free_local_data(dev);
 
 	return -ENODEV;
@@ -360,9 +378,11 @@ static void prism2_pci_remove(struct pci_dev *pdev)
 	struct net_device *dev;
 	struct hostap_interface *iface;
 	void __iomem *mem_start;
+	struct hostap_pci_priv *hw_priv;
 
 	dev = pci_get_drvdata(pdev);
 	iface = netdev_priv(dev);
+	hw_priv = iface->local->hw_priv;
 
 	/* Reset the hardware, and ensure interrupts are disabled. */
 	prism2_pci_cor_sreset(iface->local);
@@ -371,7 +391,9 @@ static void prism2_pci_remove(struct pci_dev *pdev)
 	if (dev->irq)
 		free_irq(dev->irq, dev);
 
-	mem_start = iface->local->mem_start;
+	mem_start = hw_priv->mem_start;
+	kfree(hw_priv);
+	iface->local->hw_priv = NULL;
 	prism2_free_local_data(dev);
 
 	iounmap(mem_start);
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index c2f5b1f2b857..474ef83d813e 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -42,6 +42,13 @@ module_param(ignore_cis, int, 0444);
 MODULE_PARM_DESC(ignore_cis, "Do not verify manfid information in CIS");
 
 
+/* struct local_info::hw_priv */
+struct hostap_plx_priv {
+	void __iomem *attr_mem;
+	unsigned int cor_offset;
+};
+
+
 #define PLX_MIN_ATTR_LEN 512	/* at least 2 x 256 is needed for CIS */
 #define COR_SRESET       0x80
 #define COR_LEVLREQ      0x40
@@ -261,27 +268,28 @@ static int hfa384x_to_bap(struct net_device *dev, u16 bap, void *buf, int len)
 static void prism2_plx_cor_sreset(local_info_t *local)
 {
 	unsigned char corsave;
+	struct hostap_plx_priv *hw_priv = local->hw_priv;
 
 	printk(KERN_DEBUG "%s: Doing reset via direct COR access.\n",
 	       dev_info);
 
 	/* Set sreset bit of COR and clear it after hold time */
 
-	if (local->attr_mem == NULL) {
+	if (hw_priv->attr_mem == NULL) {
 		/* TMD7160 - COR at card's first I/O addr */
-		corsave = inb(local->cor_offset);
-		outb(corsave | COR_SRESET, local->cor_offset);
+		corsave = inb(hw_priv->cor_offset);
+		outb(corsave | COR_SRESET, hw_priv->cor_offset);
 		mdelay(2);
-		outb(corsave & ~COR_SRESET, local->cor_offset);
+		outb(corsave & ~COR_SRESET, hw_priv->cor_offset);
 		mdelay(2);
 	} else {
 		/* PLX9052 */
-		corsave = readb(local->attr_mem + local->cor_offset);
+		corsave = readb(hw_priv->attr_mem + hw_priv->cor_offset);
 		writeb(corsave | COR_SRESET,
-		       local->attr_mem + local->cor_offset);
+		       hw_priv->attr_mem + hw_priv->cor_offset);
 		mdelay(2);
 		writeb(corsave & ~COR_SRESET,
-		       local->attr_mem + local->cor_offset);
+		       hw_priv->attr_mem + hw_priv->cor_offset);
 		mdelay(2);
 	}
 }
@@ -290,26 +298,27 @@ static void prism2_plx_cor_sreset(local_info_t *local)
 static void prism2_plx_genesis_reset(local_info_t *local, int hcr)
 {
 	unsigned char corsave;
+	struct hostap_plx_priv *hw_priv = local->hw_priv;
 
-	if (local->attr_mem == NULL) {
+	if (hw_priv->attr_mem == NULL) {
 		/* TMD7160 - COR at card's first I/O addr */
-		corsave = inb(local->cor_offset);
-		outb(corsave | COR_SRESET, local->cor_offset);
+		corsave = inb(hw_priv->cor_offset);
+		outb(corsave | COR_SRESET, hw_priv->cor_offset);
 		mdelay(10);
-		outb(hcr, local->cor_offset + 2);
+		outb(hcr, hw_priv->cor_offset + 2);
 		mdelay(10);
-		outb(corsave & ~COR_SRESET, local->cor_offset);
+		outb(corsave & ~COR_SRESET, hw_priv->cor_offset);
 		mdelay(10);
 	} else {
 		/* PLX9052 */
-		corsave = readb(local->attr_mem + local->cor_offset);
+		corsave = readb(hw_priv->attr_mem + hw_priv->cor_offset);
 		writeb(corsave | COR_SRESET,
-		       local->attr_mem + local->cor_offset);
+		       hw_priv->attr_mem + hw_priv->cor_offset);
 		mdelay(10);
-		writeb(hcr, local->attr_mem + local->cor_offset + 2);
+		writeb(hcr, hw_priv->attr_mem + hw_priv->cor_offset + 2);
 		mdelay(10);
 		writeb(corsave & ~COR_SRESET,
-		       local->attr_mem + local->cor_offset);
+		       hw_priv->attr_mem + hw_priv->cor_offset);
 		mdelay(10);
 	}
 }
@@ -438,6 +447,12 @@ static int prism2_plx_probe(struct pci_dev *pdev,
 	static int cards_found /* = 0 */;
 	int irq_registered = 0;
 	int tmd7160;
+	struct hostap_plx_priv *hw_priv;
+
+	hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
+	if (hw_priv == NULL)
+		return -ENOMEM;
+	memset(hw_priv, 0, sizeof(*hw_priv));
 
 	if (pci_enable_device(pdev))
 		return -EIO;
@@ -529,12 +544,13 @@ static int prism2_plx_probe(struct pci_dev *pdev,
 		goto fail;
 	iface = netdev_priv(dev);
 	local = iface->local;
+	local->hw_priv = hw_priv;
 	cards_found++;
 
 	dev->irq = pdev->irq;
 	dev->base_addr = pccard_ioaddr;
-	local->attr_mem = attr_mem;
-	local->cor_offset = cor_offset;
+	hw_priv->attr_mem = attr_mem;
+	hw_priv->cor_offset = cor_offset;
 
 	pci_set_drvdata(pdev, dev);
 
@@ -554,6 +570,9 @@ static int prism2_plx_probe(struct pci_dev *pdev,
 	return hostap_hw_ready(dev);
 
  fail:
+	kfree(hw_priv);
+	if (local)
+		local->hw_priv = NULL;
 	prism2_free_local_data(dev);
 
 	if (irq_registered && dev)
@@ -572,19 +591,23 @@ static void prism2_plx_remove(struct pci_dev *pdev)
 {
 	struct net_device *dev;
 	struct hostap_interface *iface;
+	struct hostap_plx_priv *hw_priv;
 
 	dev = pci_get_drvdata(pdev);
 	iface = netdev_priv(dev);
+	hw_priv = iface->local->hw_priv;
 
 	/* Reset the hardware, and ensure interrupts are disabled. */
 	prism2_plx_cor_sreset(iface->local);
 	hfa384x_disable_interrupts(dev);
 
-	if (iface->local->attr_mem)
-		iounmap(iface->local->attr_mem);
+	if (hw_priv->attr_mem)
+		iounmap(hw_priv->attr_mem);
 	if (dev->irq)
 		free_irq(dev->irq, dev);
 
+	kfree(iface->local->hw_priv);
+	iface->local->hw_priv = NULL;
 	prism2_free_local_data(dev);
 	pci_disable_device(pdev);
 }
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index 56416b43e414..7781e8264d64 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -876,27 +876,8 @@ struct local_info {
 	int io_debug_enabled;
 #endif /* PRISM2_IO_DEBUG */
 
-	/* struct local_info is used also in hostap.o that does not define
-	 * any PRISM2_{PCCARD,PLX,PCI}. Make sure that the hardware version
-	 * specific fields are in the end of the struct (these could also be
-	 * moved to void *priv or something like that). */
-#ifdef PRISM2_PCCARD
-	dev_node_t node;
-	dev_link_t *link;
-	int sandisk_connectplus;
-#endif /* PRISM2_PCCARD */
-
-#ifdef PRISM2_PLX
-	void __iomem *attr_mem;
-	unsigned int cor_offset;
-#endif /* PRISM2_PLX */
-
-#ifdef PRISM2_PCI
-	void __iomem *mem_start;
-#endif /* PRISM2_PCI */
-
-	/* NOTE! Do not add common entries here after hardware version
-	 * specific blocks. */
+	/* Pointer to hardware model specific (cs,pci,plx) private data. */
+	void *hw_priv;
 };
 
 
-- 
cgit v1.2.3


From b2dabd5aadae6a93026f35269e1e53c1a0c6de2d Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Wed, 13 Jul 2005 00:33:46 -0700
Subject: [PATCH] more-u32-vs-pm_message_t-fixes-6

Cc: Pavel Machek <pavel@ucw.cz>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---
 drivers/net/wireless/hostap/hostap_pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/net/wireless/hostap/hostap_pci.c')

diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 165f1450da57..4f567ef6178d 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -405,7 +405,7 @@ static void prism2_pci_remove(struct pci_dev *pdev)
 
 
 #ifdef CONFIG_PM
-static int prism2_pci_suspend(struct pci_dev *pdev, u32 state)
+static int prism2_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	struct net_device *dev = pci_get_drvdata(pdev);
 
-- 
cgit v1.2.3