Patchwork axnet_cs / pcnet_cs: moving PCMCIA_DEVICE_PROD_ID for Netgear FA411

login
register
mail settings
Submitter Komuro
Date Nov. 21, 2008, 12:48 p.m.
Message ID <20081121214812.b03d7166.komurojun-mbn@nifty.com>
Download mbox | patch
Permalink /patch/10001/
State Accepted
Delegated to: David Miller
Headers show

Comments

Komuro - Nov. 21, 2008, 12:48 p.m.
On Fri, 21 Nov 2008 00:46:57 +0100
Cord Walter <cord.walter@gmx.de> wrote:

> after noticing that my Netgear FA411 (PCMCIA-NIC) [1] stopped working with
> the release of the 2.6.25 kernel (sidux-version),

You are right. My patch has a bug.
The patch below fixes this problem.

By the way,
(1) Does your FA411 work properly with the pcnet_cs driver before?
(2) Please post the full-dmesg (axnet_cs).




Best Regards
Komuro


> Hi,
> 
> after noticing that my Netgear FA411 (PCMCIA-NIC) [1] stopped working with
> the release of the 2.6.25 kernel (sidux-version), I checked the
> respective driver sources and noticed that the pcnet_cs driver bailed
> out with "use axnet_cs instead" for the Netgear FA411, but axnet_cs
> doesn't claim this ID.
> 
> I compiled a kernel with the PCMCIA-ID for the netgear card moved to
> axnet_cs from pcnet_cs which worked. I then contacted sidux-kernel
> maintainer Stefan Lippers-Hollmann who turned the info into this patch
> and integrated it into the kernel:
> 
> <http://svn.berlios.de/svnroot/repos/fullstory/linux-sidux-2.6/trunk/debian/patches/features/2.6.27.4_PCMCIA_move-PCMCIA-ID-for-Netgear-FA411-from-pcnet_cs-to-axnet_cs.patch>
> 
> This works for me and AFAIK there were no reports of any breakage for
> other devices on sidux-support.
> 
> This looks like a trivial patch, but since I have very limited
> experience with kernel modifications  I might be woefully wrong there.
> But if there are no side effects of this patch, is it possible to get it
> into the official kernel?
> 
> I can provide more detailed information on the affected hardware if
> necessary.
> 
> -cord
> 
> 
> [1]
> Socket 1 Device 0:      [axnet_cs]              (bus ID: 1.0)
>         Configuration:  state: on
>         Product Name:   NETGEAR FA411 Fast Ethernet
>         Identification: manf_id: 0x0149 card_id: 0x0411
>                         function: 6 (network)
>                         prod_id(1): "NETGEAR" (0x9aa79dc3)
>                         prod_id(2): "FA411" (0x40fad875)
>                         prod_id(3): "Fast Ethernet" (0xb4be14e3)
>                         prod_id(4): --- (---)
> -- 
> Cord Walter
> email: cord.walter@gmx.de
> 
> Weil es niemanden etwas angeht, dass ich nichts zu verbergen habe:
> http://www.gnupg.org/
> http://www.truecrypt.org/
> ...und ├╝berhaupt: http://www.FreiheitstattAngst.de
> 
> 
>
Cord Walter - Nov. 21, 2008, 2:10 p.m.
Komuro schrieb:
> On Fri, 21 Nov 2008 00:46:57 +0100
> Cord Walter <cord.walter@gmx.de> wrote:
> 
>> after noticing that my Netgear FA411 (PCMCIA-NIC) [1] stopped working with
>> the release of the 2.6.25 kernel (sidux-version),
> 
> You are right. My patch has a bug.
> The patch below fixes this problem.
> 
> By the way,
> (1) Does your FA411 work properly with the pcnet_cs driver before?

Yes, it worked until the 2.6.25 release.

> (2) Please post the full-dmesg (axnet_cs).

This is what I get from dmesg when plugging in the FA411:

pccard: PCMCIA card inserted into slot 1
cs: memory probe 0xa0000000-0xa0ffffff: clean.
pcmcia: registering new device pcmcia1.0
eth0: Asix AX88790: io 0x300, irq 3, hw_addr 00:09:5b:08:98:93
udev: renamed network interface eth0 to eth1
NET: Registered protocol family 17


Does this help?

-cord
Cord Walter - Jan. 31, 2009, 11:18 p.m.
Hi!

I just noticed that I still had a patch lying around by Komuro
<komurojun-mbn@nifty.com> from back when I was troubleshooting my
problems with the pcnet_cs/axnet_cs driver and my Netgear PCMCIA-NIC.

Looks like a simple typo to me - I tested the patch with 2.6.28 kernel
and it worked...

bye,

cord

Komuro schrieb:
 > [PATCH] pcnet_cs:fix misuse of the equality operator.
> 
> 
> pcnet_cs:
> 	fix misuse of the equality operator.
> 
>  
> Signed-off-by: Cord Walter <qord@cwalter.net>
> Signed-off-by: Komuro <komurojun-mbn@nifty.com>
> 
> ---
> 
> --- linux-2.6.29-rc3/drivers/net/pcmcia/pcnet_cs.c.orig	2009-01-31 06:44:03.000000000 +0900
> +++ linux-2.6.29-rc3/drivers/net/pcmcia/pcnet_cs.c	2009-01-31 06:44:21.000000000 +0900
> @@ -586,7 +586,7 @@ static int pcnet_config(struct pcmcia_de
>      }
>  
>      if ((link->conf.ConfigBase == 0x03c0)
> -	&& (link->manf_id == 0x149) && (link->card_id = 0xc1ab)) {
> +	&& (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) {
>  	printk(KERN_INFO "pcnet_cs: this is an AX88190 card!\n");
>  	printk(KERN_INFO "pcnet_cs: use axnet_cs instead.\n");
>  	goto failed;
>
Cord Walter - Feb. 1, 2009, 9:36 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Now with properly formatted patch...


[PATCH] pcnet_cs:fix misuse of the equality operator.


pcnet_cs:
	fix misuse of the equality operator.


Signed-off-by: Cord Walter <qord@cwalter.net>
Signed-off-by: Komuro <komurojun-mbn@nifty.com>

- ---

- --- linux-2.6.29-rc3/drivers/net/pcmcia/pcnet_cs.c.orig	2009-01-31
06:44:03.000000000 +0900
+++ linux-2.6.29-rc3/drivers/net/pcmcia/pcnet_cs.c	2009-01-31
06:44:21.000000000 +0900
@@ -586,7 +586,7 @@ static int pcnet_config(struct pcmcia_de
     }

     if ((link->conf.ConfigBase == 0x03c0)
- -	&& (link->manf_id == 0x149) && (link->card_id = 0xc1ab)) {
+	&& (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) {
 	printk(KERN_INFO "pcnet_cs: this is an AX88190 card!\n");
 	printk(KERN_INFO "pcnet_cs: use axnet_cs instead.\n");
 	goto failed;

- --
Cord Walter
email: cord.walter@gmx.de

Weil es niemanden etwas angeht, dass ich nichts zu verbergen habe:
http://www.gnupg.org/
http://www.truecrypt.org/
...und ├╝berhaupt: http://www.FreiheitstattAngst.de
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkmFbTUACgkQpYxkftnOwIocoACfYtnmxxXygIe4SSV7mgnqWLHa
wFMAn21j8G+MqJGSsoqhd/dFNPIb2mYH
=BAkg
-----END PGP SIGNATURE-----
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Feb. 1, 2009, 9:43 a.m.
From: Cord Walter <cord.walter@gmx.de>
Date: Sun, 01 Feb 2009 10:36:53 +0100

> Now with properly formatted patch...
 ...
> 06:44:03.000000000 +0900
> +++ linux-2.6.29-rc3/drivers/net/pcmcia/pcnet_cs.c	2009-01-31
> 06:44:21.000000000 +0900
> @@ -586,7 +586,7 @@ static int pcnet_config(struct pcmcia_de
>      }
> 
>      if ((link->conf.ConfigBase == 0x03c0)
> - -	&& (link->manf_id == 0x149) && (link->card_id = 0xc1ab)) {
> +	&& (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) {
>  	printk(KERN_INFO "pcnet_cs: this is an AX88190 card!\n");

Still looks corrupted here.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Cord Walter - Feb. 1, 2009, 10:38 a.m.
[PATCH] pcnet_cs:fix misuse of the equality operator.


pcnet_cs:
	fix misuse of the equality operator.


Signed-off-by: Cord Walter <qord@cwalter.net>
Signed-off-by: Komuro <komurojun-mbn@nifty.com>

---

--- linux-2.6.29-rc3/drivers/net/pcmcia/pcnet_cs.c.orig	2009-01-31
06:44:03.000000000 +0900
+++ linux-2.6.29-rc3/drivers/net/pcmcia/pcnet_cs.c	2009-01-31
06:44:21.000000000 +0900
@@ -586,7 +586,7 @@ static int pcnet_config(struct pcmcia_de
     }

     if ((link->conf.ConfigBase == 0x03c0)
-	&& (link->manf_id == 0x149) && (link->card_id = 0xc1ab)) {
+	&& (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) {
 	printk(KERN_INFO "pcnet_cs: this is an AX88190 card!\n");
 	printk(KERN_INFO "pcnet_cs: use axnet_cs instead.\n");
 	goto failed;

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- linux-2.6.28-rc6/drivers/net/pcmcia/pcnet_cs.c.orig	2008-11-21 21:39:08.000000000 +0900
+++ linux-2.6.28-rc6/drivers/net/pcmcia/pcnet_cs.c	2008-11-21 21:39:24.000000000 +0900
@@ -587,7 +587,7 @@  static int pcnet_config(struct pcmcia_de
     }
 
     if ((link->conf.ConfigBase == 0x03c0)
-	&& (link->manf_id == 0x149) && (link->card_id = 0xc1ab)) {
+	&& (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) {
 	printk(KERN_INFO "pcnet_cs: this is an AX88190 card!\n");
 	printk(KERN_INFO "pcnet_cs: use axnet_cs instead.\n");
 	goto failed;