From: Russell King <rmk+lkml@arm.linux.org.uk>
To: "Angelo Dell'Aera" <buffer@antifork.org>,
Linux-Kernel <linux-kernel@vger.kernel.org>,
Linux-Net <linux-net@vger.kernel.org>
Subject: Re: airo_cs problem - kernel 2.6.1
Date: Tue, 27 Jan 2004 12:55:39 +0000 [thread overview]
Message-ID: <20040127125539.F18409@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20040127124538.E18409@flint.arm.linux.org.uk>; from rmk+lkml@arm.linux.org.uk on Tue, Jan 27, 2004 at 12:45:38PM +0000
On Tue, Jan 27, 2004 at 12:45:38PM +0000, Russell King wrote:
> On Tue, Jan 27, 2004 at 01:07:09PM +0100, Angelo Dell'Aera wrote:
> > Today I experienced this problem with a Cisco Aironet 350.
> > I just want to point out it's the first time it happens.
> > In fact, I still used this NIC on this kernel (2.6.1) without
> > any kind of problem. Attached is an extract from my log.
>
Ok, actually the bug has been fixed in 2.6.2-rc, so this problem can
finally be laid to rest. Here's the as-merged fix:
===== drivers/net/wireless/airo.c 1.80 vs 1.81 =====
--- 1.80/drivers/net/wireless/airo.c Sun Dec 7 13:22:52 2003
+++ 1.81/drivers/net/wireless/airo.c Sat Jan 10 16:04:13 2004
@@ -1027,7 +1027,6 @@
#define FLAG_802_11 7
#define FLAG_PENDING_XMIT 9
#define FLAG_PENDING_XMIT11 10
-#define FLAG_PCI 11
#define JOB_MASK 0x1ff0000
#define JOB_DIE 16
#define JOB_XMIT 17
@@ -4623,7 +4622,6 @@
return -ENODEV;
pci_set_drvdata(pdev, dev);
- set_bit (FLAG_PCI, &((struct airo_info *)dev->priv)->flags);
return 0;
}
@@ -4653,7 +4651,7 @@
#ifdef CONFIG_PCI
printk( KERN_INFO "airo: Probing for PCI adapters\n" );
- pci_module_init(&airo_driver);
+ pci_register_driver(&airo_driver);
printk( KERN_INFO "airo: Finished probing for PCI adapters\n" );
#endif
@@ -4665,22 +4663,15 @@
static void __exit airo_cleanup_module( void )
{
- int is_pci = 0;
while( airo_devices ) {
printk( KERN_INFO "airo: Unregistering %s\n", airo_devices->dev->name );
-#ifdef CONFIG_PCI
- if (test_bit(FLAG_PCI, &((struct airo_info *)airo_devices->dev->priv)->flags))
- is_pci = 1;
-#endif
stop_airo_card( airo_devices->dev, 1 );
}
remove_proc_entry("aironet", proc_root_driver);
- if (is_pci) {
#ifdef CONFIG_PCI
- pci_unregister_driver(&airo_driver);
+ pci_unregister_driver(&airo_driver);
#endif
- }
}
#ifdef WIRELESS_EXT
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
prev parent reply other threads:[~2004-01-27 12:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-01-27 12:07 airo_cs problem - kernel 2.6.1 Angelo Dell'Aera
2004-01-27 12:45 ` Russell King
2004-01-27 12:55 ` Russell King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040127125539.F18409@flint.arm.linux.org.uk \
--to=rmk+lkml@arm.linux.org.uk \
--cc=buffer@antifork.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-net@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox