Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.

BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA

6 files changed, 224 insertions, 0 deletions

diff --git a/hostap/hostap-modules-0.2.4/Makefile.patch b/hostap/hostap-modules-0.2.4/Makefile.patch
index e69de29bb2..2fc5e9ed4b 100644
--- a/hostap/hostap-modules-0.2.4/Makefile.patch
+++ b/hostap/hostap-modules-0.2.4/Makefile.patch
@@ -0,0 +1,11 @@
+--- hostap-driver-0.2.4/Makefile.old	2004-07-31 10:35:50.000000000 +0100
++++ hostap-driver-0.2.4/Makefile	2004-07-31 10:35:56.000000000 +0100
+@@ -51,7 +51,7 @@
+ 
+ VERFILE := $(KERNEL_PATH)/include/linux/version.h
+ KERNELRELEASE := $(shell if [ -r $(VERFILE) ]; \
+-	then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -1 | xargs echo; \
++	then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -n 1 | xargs echo; \
+ 	else uname -r; fi)
+ KERNELVER := $(shell echo "$(KERNELRELEASE)" | \
+ 	sed "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/")
diff --git a/hostap/hostap-modules-0.2.4/mtx_compat.diff b/hostap/hostap-modules-0.2.4/mtx_compat.diff
index e69de29bb2..c2d6662d69 100644
--- a/hostap/hostap-modules-0.2.4/mtx_compat.diff
+++ b/hostap/hostap-modules-0.2.4/mtx_compat.diff
@@ -0,0 +1,20 @@
+--- 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/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff b/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff
index e69de29bb2..2f7642ff08 100644
--- a/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff
+++ b/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff
@@ -0,0 +1,81 @@
+--- driver/modules/hostap_pci.c.orig	2004-02-09 20:54:07.000000000 +0100
++++ driver/modules/hostap_pci.c	2004-08-09 17:18:49.591216712 +0200
+@@ -49,6 +49,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)
+@@ -277,6 +284,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);
+@@ -292,7 +303,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:
+@@ -390,17 +401,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 (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;
+ }
+ 
diff --git a/hostap/hostap-modules-0.2.5/Makefile.patch b/hostap/hostap-modules-0.2.5/Makefile.patch
index e69de29bb2..2fc5e9ed4b 100644
--- a/hostap/hostap-modules-0.2.5/Makefile.patch
+++ b/hostap/hostap-modules-0.2.5/Makefile.patch
@@ -0,0 +1,11 @@
+--- hostap-driver-0.2.4/Makefile.old	2004-07-31 10:35:50.000000000 +0100
++++ hostap-driver-0.2.4/Makefile	2004-07-31 10:35:56.000000000 +0100
+@@ -51,7 +51,7 @@
+ 
+ VERFILE := $(KERNEL_PATH)/include/linux/version.h
+ KERNELRELEASE := $(shell if [ -r $(VERFILE) ]; \
+-	then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -1 | xargs echo; \
++	then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -n 1 | xargs echo; \
+ 	else uname -r; fi)
+ KERNELVER := $(shell echo "$(KERNELRELEASE)" | \
+ 	sed "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/")
diff --git a/hostap/hostap-modules-0.2.5/mtx_compat.diff b/hostap/hostap-modules-0.2.5/mtx_compat.diff
index e69de29bb2..c2d6662d69 100644
--- a/hostap/hostap-modules-0.2.5/mtx_compat.diff
+++ b/hostap/hostap-modules-0.2.5/mtx_compat.diff
@@ -0,0 +1,20 @@
+--- 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/hostap/hostap-modules-0.2.5/mtx_hostap_deferred_irq.diff b/hostap/hostap-modules-0.2.5/mtx_hostap_deferred_irq.diff
index e69de29bb2..2f7642ff08 100644
--- a/hostap/hostap-modules-0.2.5/mtx_hostap_deferred_irq.diff
+++ b/hostap/hostap-modules-0.2.5/mtx_hostap_deferred_irq.diff
@@ -0,0 +1,81 @@
+--- driver/modules/hostap_pci.c.orig	2004-02-09 20:54:07.000000000 +0100
++++ driver/modules/hostap_pci.c	2004-08-09 17:18:49.591216712 +0200
+@@ -49,6 +49,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)
+@@ -277,6 +284,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);
+@@ -292,7 +303,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:
+@@ -390,17 +401,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 (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;
+ }
+