Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751500AbVKISk5 (ORCPT ); Wed, 9 Nov 2005 13:40:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751492AbVKISkZ (ORCPT ); Wed, 9 Nov 2005 13:40:25 -0500 Received: from mail.kroah.org ([69.55.234.183]:20381 "EHLO perch.kroah.org") by vger.kernel.org with ESMTP id S1751495AbVKISiA (ORCPT ); Wed, 9 Nov 2005 13:38:00 -0500 Date: Wed, 9 Nov 2005 10:36:55 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Chuck Wolber , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, jgarzik@pobox.com, bunk@stusta.de, netdev@vger.kernel.org, Benjamin Reed Subject: [patch 06/11] airo.c/airo_cs.c: correct prototypes Message-ID: <20051109183655.GG3670@kroah.com> References: <20051109182205.294803000@press.kroah.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="airo.c-airo_cs.c-correct-prototypes.patch" In-Reply-To: <20051109183614.GA3670@kroah.com> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2383 Lines: 72 From: Adrian Bunk 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 Signed-off-by: Greg Kroah-Hartman --- 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 +++ linux-2.6.14.1/drivers/net/wireless/airo.h @@ -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.1.orig/drivers/net/wireless/airo.c +++ linux-2.6.14.1/drivers/net/wireless/airo.c @@ -46,6 +46,8 @@ #include #include +#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.1.orig/drivers/net/wireless/airo_cs.c +++ linux-2.6.14.1/drivers/net/wireless/airo_cs.c @@ -42,6 +42,8 @@ #include #include +#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 @@ MODULE_SUPPORTED_DEVICE("Aironet 4500, 4 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/