/[linux-patches]/genpatches-2.6/tags/2.6.14-6/1001_2_airo_cs-correct-prototypes.patch
Gentoo

Contents of /genpatches-2.6/tags/2.6.14-6/1001_2_airo_cs-correct-prototypes.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 233 - (show annotations) (download)
Thu Dec 15 16:43:31 2005 UTC (12 years, 10 months ago) by dsd
File size: 2497 byte(s)
2.6.14-6 release
1 From stable-bounces@linux.kernel.org Sat Nov 5 08:42:46 2005
2 Date: Sat, 5 Nov 2005 17:42:27 +0100
3 From: Adrian Bunk <bunk@stusta.de>
4 To: jgarzik@pobox.com
5 Message-ID: <20051105164227.GK5368@stusta.de>
6 Content-Disposition: inline
7 Cc: netdev@vger.kernel.org, Benjamin Reed <breed@users.sourceforge.net>, linux-kernel@vger.kernel.org, stable@kernel.org
8 Subject: airo.c/airo_cs.c: correct prototypes
9
10 This patch creates a file airo.h containing prototypes of the global
11 functions in airo.c used by airo_cs.c .
12
13 If you got strange problems with either airo_cs devices or in any other
14 completely unrelated part of the kernel shortly or long after a airo_cs
15 device was detected by the kernel, this might have been caused by the
16 fact that caller and callee disagreed regarding the size of the first
17 argument to init_airo_card()...
18
19 Signed-off-by: Adrian Bunk <bunk@stusta.de>
20 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
21
22 ---
23 drivers/net/wireless/airo.c | 2 ++
24 drivers/net/wireless/airo.h | 9 +++++++++
25 drivers/net/wireless/airo_cs.c | 6 ++----
26 3 files changed, 13 insertions(+), 4 deletions(-)
27
28 --- /dev/null
29 +++ linux-2.6.14.1/drivers/net/wireless/airo.h
30 @@ -0,0 +1,9 @@
31 +#ifndef _AIRO_H_
32 +#define _AIRO_H_
33 +
34 +struct net_device *init_airo_card(unsigned short irq, int port, int is_pcmcia,
35 + struct device *dmdev);
36 +int reset_airo_card(struct net_device *dev);
37 +void stop_airo_card(struct net_device *dev, int freeres);
38 +
39 +#endif /* _AIRO_H_ */
40 --- linux-2.6.14.1.orig/drivers/net/wireless/airo.c
41 +++ linux-2.6.14.1/drivers/net/wireless/airo.c
42 @@ -46,6 +46,8 @@
43 #include <linux/pci.h>
44 #include <asm/uaccess.h>
45
46 +#include "airo.h"
47 +
48 #ifdef CONFIG_PCI
49 static struct pci_device_id card_ids[] = {
50 { 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, },
51 --- linux-2.6.14.1.orig/drivers/net/wireless/airo_cs.c
52 +++ linux-2.6.14.1/drivers/net/wireless/airo_cs.c
53 @@ -42,6 +42,8 @@
54 #include <asm/io.h>
55 #include <asm/system.h>
56
57 +#include "airo.h"
58 +
59 /*
60 All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If
61 you do not define PCMCIA_DEBUG at all, all the debug code will be
62 @@ -78,10 +80,6 @@ MODULE_SUPPORTED_DEVICE("Aironet 4500, 4
63 event handler.
64 */
65
66 -struct net_device *init_airo_card( int, int, int, struct device * );
67 -void stop_airo_card( struct net_device *, int );
68 -int reset_airo_card( struct net_device * );
69 -
70 static void airo_config(dev_link_t *link);
71 static void airo_release(dev_link_t *link);
72 static int airo_event(event_t event, int priority,

  ViewVC Help
Powered by ViewVC 1.1.20