[2.6 patch] airo.c/airo_cs.c: correct prototypes

From: Adrian Bunk
Date: Sat Nov 05 2005 - 11:42:31 EST


This patch creates a file airo.h containing prototypes of the global
functions in airo.c used by airo_cs.c .

If you got strange problems with either airo_cs devices or in any other
completely unrelated part of the kernel shortly or long after a airo_cs
device was detected by the kernel, this might have been caused by the
fact that caller and callee disagreed regarding the size of the first
argument to init_airo_card()...


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

drivers/net/wireless/airo.c | 2 ++
drivers/net/wireless/airo.h | 9 +++++++++
drivers/net/wireless/airo_cs.c | 6 ++----
3 files changed, 13 insertions(+), 4 deletions(-)

--- /dev/null 2005-04-28 03:52:17.000000000 +0200
+++ linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo.h 2005-11-05 16:57:14.000000000 +0100
@@ -0,0 +1,9 @@
+#ifndef _AIRO_H_
+#define _AIRO_H_
+
+struct net_device *init_airo_card(unsigned short irq, int port, int is_pcmcia,
+ struct device *dmdev);
+int reset_airo_card(struct net_device *dev);
+void stop_airo_card(struct net_device *dev, int freeres);
+
+#endif /* _AIRO_H_ */
--- linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo.c.old 2005-11-05 16:54:10.000000000 +0100
+++ linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo.c 2005-11-05 16:54:43.000000000 +0100
@@ -47,6 +47,8 @@
#include <linux/pci.h>
#include <asm/uaccess.h>

+#include "airo.h"
+
#ifdef CONFIG_PCI
static struct pci_device_id card_ids[] = {
{ 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, },
--- linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo_cs.c.old 2005-11-05 16:57:27.000000000 +0100
+++ linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo_cs.c 2005-11-05 16:57:58.000000000 +0100
@@ -42,6 +42,8 @@
#include <asm/io.h>
#include <asm/system.h>

+#include "airo.h"
+
/*
All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If
you do not define PCMCIA_DEBUG at all, all the debug code will be
@@ -78,10 +80,6 @@
event handler.
*/

-struct net_device *init_airo_card( int, int, int, struct device * );
-void stop_airo_card( struct net_device *, int );
-int reset_airo_card( struct net_device * );
-
static void airo_config(dev_link_t *link);
static void airo_release(dev_link_t *link);
static int airo_event(event_t event, int priority,

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/