hostap-modules: cleanup to avoid duplication

5 files changed, 0 insertions, 304 deletions

diff --git a/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty b/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch b/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch
deleted file mode 100644
index b139ef38f1..0000000000
--- a/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hostap-driver-0.3.7/driver/modules/hostap_compat.h.old	2005-04-17 09:12:38.304421464 +0100
-+++ hostap-driver-0.3.7/driver/modules/hostap_compat.h	2005-04-17 09:13:04.413452288 +0100
-@@ -5,7 +5,7 @@
- #define NEW_MODULE_CODE
- #endif
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) && !defined(CONFIG_IPAQ_HANDHELD)
- 
- #define HOSTAP_QUEUE struct tq_struct
- 
diff --git a/packages/hostap/hostap-modules-0.4.4/kernel_updates.patch b/packages/hostap/hostap-modules-0.4.4/kernel_updates.patch
deleted file mode 100644
index 70487a96f8..0000000000
--- a/packages/hostap/hostap-modules-0.4.4/kernel_updates.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Index: hostap-driver-0.4.4/driver/modules/hostap_cs.c
-===================================================================
---- hostap-driver-0.4.4.orig/driver/modules/hostap_cs.c	2005-08-21 20:23:21.000000000 +0100
-+++ hostap-driver-0.4.4/driver/modules/hostap_cs.c	2005-09-17 17:09:05.000000000 +0100
-@@ -207,12 +207,17 @@
- #include "hostap_hw.c"
- 
- 
--
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15))
- static void prism2_detach(dev_link_t *link);
-+#else
-+static void prism2_detach(struct pcmcia_device *p_dev);
-+#endif
-+
- static void prism2_release(u_long arg);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15))
- static int prism2_event(event_t event, int priority,
- 			event_callback_args_t *args);
--
-+#endif
- 
- static int prism2_pccard_card_present(local_info_t *local)
- {
-@@ -508,25 +513,36 @@
- }
- #endif
- 
-+static int prism2_config(dev_link_t *link);
- 
- /* allocate local data and register with CardServices
-  * initialize dev_link structure, but do not configure the card yet */
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15))
- static dev_link_t *prism2_attach(void)
-+#else
-+static int prism2_attach(struct pcmcia_device *p_dev)
-+#endif
- {
- 	dev_link_t *link;
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15))
- 	client_reg_t client_reg;
- 	int ret;
-+#endif
- 
- 	link = kmalloc(sizeof(dev_link_t), GFP_KERNEL);
- 	if (link == NULL)
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15))
- 		return NULL;
--
-+#else
-+		return -ENOMEM;
-+#endif
- 	memset(link, 0, sizeof(dev_link_t));
- 
- 	PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info);
- 	link->conf.Vcc = 33;
- 	link->conf.IntType = INT_MEMORY_AND_IO;
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15))
- 	/* register with CardServices */
- 	link->next = dev_list;
- 	dev_list = link;
-@@ -547,12 +563,28 @@
- 		prism2_detach(link);
- 		return NULL;
- 	}
-+
- 	return link;
--}
-+#else
-+	link->handle = p_dev;
-+	p_dev->instance = link;
-+
-+	link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-+	prism2_config(link);
- 
-+	return 0;
-+#endif
-+}
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15))
- static void prism2_detach(dev_link_t *link)
-+#else
-+static void prism2_detach(struct pcmcia_device *p_dev)
-+#endif
- {
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15))
-+	dev_link_t *link = dev_to_instance(p_dev);
-+#endif
- 	dev_link_t **linkp;
- 
- 	PDEBUG(DEBUG_FLOW, "prism2_detach\n");
-@@ -570,6 +602,7 @@
- 		prism2_release((u_long)link);
- 	}
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15))
- 	if (link->handle) {
- 		int res = pcmcia_deregister_client(link->handle);
- 		if (res) {
-@@ -577,6 +610,7 @@
- 			cs_error(link->handle, DeregisterClient, res);
- 		}
- 	}
-+#endif
- 
- 	*linkp = link->next;
- 	/* release net devices */
-@@ -855,7 +889,53 @@
- 	PDEBUG(DEBUG_FLOW, "release - done\n");
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15))
-+static int prism2_suspend1(struct pcmcia_device *dev)
-+{
-+	dev_link_t *link = dev_to_instance(dev);
-+	struct net_device *ndev = (struct net_device *) link->priv;
-+
-+	PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
-+	link->state |= DEV_SUSPEND;
-+	/* fall through */
- 
-+	if (link->state & DEV_CONFIG) {
-+		if (link->open) {
-+			netif_stop_queue(ndev);
-+			netif_device_detach(ndev);
-+		}
-+		prism2_suspend(ndev);
-+		pcmcia_release_configuration(link->handle);
-+	}
-+
-+	return 0;
-+}
-+
-+static int prism2_resume1(struct pcmcia_device *dev)
-+{
-+	dev_link_t *link = dev_to_instance(dev);
-+	struct net_device *ndev = (struct net_device *) link->priv;
-+
-+	PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);
-+
-+	link->state &= ~DEV_SUSPEND;
-+	/* fall through */
-+
-+	if (link->state & DEV_CONFIG) {
-+		pcmcia_request_configuration(link->handle, &link->conf);
-+		prism2_hw_shutdown(ndev, 1);
-+		prism2_hw_config(ndev, link->open ? 0 : 1);
-+		if (link->open) {
-+			netif_device_attach(ndev);
-+			netif_start_queue(ndev);
-+		}
-+	}
-+
-+	return 0;
-+}
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15))
- static int prism2_event(event_t event, int priority,
- 			event_callback_args_t *args)
- {
-@@ -924,7 +1004,7 @@
- 	}
- 	return 0;
- }
--
-+#endif
- 
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,67)
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13))
-@@ -983,11 +1063,20 @@
- 	.drv		= {
- 		.name	= "hostap_cs",
- 	},
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15))
-+	.probe		= prism2_attach,
-+	.remove		= prism2_detach,
-+	.suspend	= prism2_suspend1,
-+	.resume		= prism2_resume1,
-+#else
- 	.attach		= prism2_attach,
- 	.detach		= prism2_detach,
-+#endif
- 	.owner		= THIS_MODULE,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15))
- 	.event		= prism2_event,
-+#endif
- 	.id_table	= hostap_cs_ids,
- #endif
- };
diff --git a/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff b/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff
deleted file mode 100644
index c2d6662d69..0000000000
--- a/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- driver/modules/hostap_compat.h.orig	2004-08-09 16:16:48.359929856 +0200
-+++ driver/modules/hostap_compat.h	2004-08-09 16:17:12.383277752 +0200
-@@ -13,7 +13,7 @@
- MOD_INC_USE_COUNT; \
- if (schedule_task((q)) == 0) \
- 	MOD_DEC_USE_COUNT;
--
-+/*
- static inline void flush_scheduled_work(void)
- {
- 	flush_scheduled_tasks();
-@@ -27,7 +27,7 @@
- 	tq->routine = routine;
- 	tq->data = data;
- }
--
-+*/
- #else /* kernel < 2.5.44 */
- 
- #define HOSTAP_QUEUE struct work_struct
diff --git a/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff
deleted file mode 100644
index e979b72d93..0000000000
--- a/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff
+++ /dev/null
@@ -1,81 +0,0 @@
---- driver/modules/hostap_pci.c.orig	2004-11-30 06:41:48.000000000 +0100
-+++ driver/modules/hostap_pci.c	2005-01-17 19:47:33.710400496 +0100
-@@ -50,6 +50,13 @@
- };
- 
- 
-+#define DEFERRED_IRQ_INITIALIZATION
-+
-+#ifdef DEFERRED_IRQ_INITIALIZATION
-+struct net_device *devb[MAX_PARM_DEVICES];
-+#endif
-+
-+
- #ifdef PRISM2_IO_DEBUG
- 
- static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)
-@@ -280,6 +287,10 @@
- 
- 	pci_set_drvdata(pdev, dev);
- 
-+#ifdef DEFERRED_IRQ_INITIALIZATION
-+	printk("%s: deferred initialization of IRQs\n", dev_info);
-+	devb[cards_found-1] = dev;
-+#else
- 	if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name,
- 			dev)) {
- 		printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
-@@ -295,7 +306,7 @@
- 
- 	printk(KERN_INFO "%s: Intersil Prism2.5 PCI: "
- 	       "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq);
--
-+#endif
- 	return hostap_hw_ready(dev);
- 
-  fail:
-@@ -399,18 +410,43 @@
- };
- 
- 
-+#ifdef DEFERRED_IRQ_INITIALIZATION
-+static void deferred_init(int num_devices)
-+{
-+      int n;
-+      for (n=0; n<num_devices && n<MAX_PARM_DEVICES; n++)
-+      {
-+              if (request_irq(devb[n]->irq, prism2_interrupt, SA_SHIRQ, devb[n]->name,
-+                              devb[n])) {
-+                      printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name);
-+              }
-+              if (prism2_hw_config(devb[n], 1)) {
-+                      printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name)
-+;
-+              }
-+              printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]->
-+irq);
-+      }
-+}
-+#endif
-+
- static int __init init_prism2_pci(void)
- {
- 	printk(KERN_INFO "%s: %s\n", dev_info, version);
- 
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10))
--	if (pci_register_driver(&prism2_pci_drv_id) <= 0) {
-+	int n;
-+	if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) {
- 		printk("hostap_pci: No devices found, driver not "
- 		       "installed.\n");
- 		pci_unregister_driver(&prism2_pci_drv_id);
- 		return -ENODEV;
- 	}
- 
-+#ifdef DEFERRED_IRQ_INITIALIZATION
-+	deferred_init(n);
-+#endif
-+
- 	return 0;
- #else
- 	return pci_register_driver(&prism2_pci_drv_id);