netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* axnet_cs / pcnet_cs: moving PCMCIA_DEVICE_PROD_ID for Netgear FA411
@ 2008-11-20 23:46 Cord Walter
  2008-11-21 12:48 ` Komuro
  0 siblings, 1 reply; 9+ messages in thread
From: Cord Walter @ 2008-11-20 23:46 UTC (permalink / raw)
  To: netdev; +Cc: linux-pcmcia

[-- Attachment #1: Type: text/plain, Size: 1842 bytes --]

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



[-- Attachment #2: 2.6.27.4_PCMCIA_move-PCMCIA-ID-for-Netgear-FA411-from-pcnet_cs-to-axnet_cs.patch --]
[-- Type: text/x-diff, Size: 2824 bytes --]

From: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Date: Sat, 1 Nov 2008 23:53:04 +0000
Subject: [PATCH] PCMCIA: move PCMCIA ID for Netgear FA411 from pcnet_cs to axnet_cs:

Since kernel 2.6.25, commit 61da96be07ec860e260ca4af0199b9d48d000b80 
(pcnet_cs: if AX88190-based card, printk "use axnet_cs instead" message.), 
pcnet_cs bails out with "use axnet_cs instead" for the Netgear FA411, but 
axnet_cs doesn't claim this ID.

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): --- (---)

Cc: stable <stable@kernel.org> [2.6.25, 2.6.26, 2.6.27]
Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Signed-off-by: Cord Walter <qord@cwalter.net>
---
 drivers/net/pcmcia/axnet_cs.c |    1 +
 drivers/net/pcmcia/pcnet_cs.c |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index b37a498..713091e 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -779,6 +779,7 @@ static struct pcmcia_device_id axnet_ids[] = {
 	PCMCIA_DEVICE_PROD_ID12("IO DATA", "ETXPCM", 0x547e66dc, 0x233adac2),
 	PCMCIA_DEVICE_PROD_ID12("Linksys", "EtherFast 10/100 PC Card (PCMPC100 V3)", 0x0733cc81, 0x232019a8),
 	PCMCIA_DEVICE_PROD_ID12("MELCO", "LPC3-TX", 0x481e0094, 0xf91af609),
+	PCMCIA_DEVICE_PROD_ID12("NETGEAR", "FA411", 0x9aa79dc3, 0x40fad875),
 	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "100BASE", 0x281f1c5d, 0x7c2add04),
 	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "FastEtherCard", 0x281f1c5d, 0x7ef26116),
 	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "FEP501", 0x281f1c5d, 0x2e272058),
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index e40d630..ce486f0 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -1693,7 +1693,6 @@ static struct pcmcia_device_id pcnet_ids[] = {
 	PCMCIA_DEVICE_PROD_ID12("National Semiconductor", "InfoMover NE4100", 0x36e1191f, 0xa6617ec8),
 	PCMCIA_DEVICE_PROD_ID12("NEC", "PC-9801N-J12", 0x18df0ba0, 0xbc912d76),
 	PCMCIA_DEVICE_PROD_ID12("NETGEAR", "FA410TX", 0x9aa79dc3, 0x60e5bc0e),
-	PCMCIA_DEVICE_PROD_ID12("NETGEAR", "FA411", 0x9aa79dc3, 0x40fad875),
 	PCMCIA_DEVICE_PROD_ID12("Network Everywhere", "Fast Ethernet 10/100 PC Card", 0x820a67b6, 0x31ed1a5f),
 	PCMCIA_DEVICE_PROD_ID12("NextCom K.K.", "Next Hawk", 0xaedaec74, 0xad050ef1),
 	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "10/100Mbps Ethernet Card", 0x281f1c5d, 0x6e41773b),
-- 
1.5.6.5




[-- Attachment #3: Type: text/plain, Size: 0 bytes --]



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: axnet_cs / pcnet_cs: moving PCMCIA_DEVICE_PROD_ID for Netgear FA411
  2008-11-20 23:46 axnet_cs / pcnet_cs: moving PCMCIA_DEVICE_PROD_ID for Netgear FA411 Cord Walter
@ 2008-11-21 12:48 ` Komuro
  2008-11-21 14:10   ` Cord Walter
  0 siblings, 1 reply; 9+ messages in thread
From: Komuro @ 2008-11-21 12:48 UTC (permalink / raw)
  To: Cord Walter; +Cc: netdev, linux-pcmcia, linux-kernel

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).


--- 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;


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
> 
> 
> 


-- 
Komuro <komurojun-mbn@nifty.com>

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: axnet_cs / pcnet_cs: moving PCMCIA_DEVICE_PROD_ID for Netgear FA411
  2008-11-21 12:48 ` Komuro
@ 2008-11-21 14:10   ` Cord Walter
       [not found]     ` <20081124160959.b02ff889.komurojun-mbn@nifty.com>
  0 siblings, 1 reply; 9+ messages in thread
From: Cord Walter @ 2008-11-21 14:10 UTC (permalink / raw)
  To: Komuro; +Cc: netdev, linux-pcmcia, linux-kernel

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
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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* pcnet_cs: fix misuse of the equality operator.
       [not found]         ` <20090131071342.2b45cbe8.komurojun-mbn@nifty.com>
@ 2009-01-31 23:18           ` Cord Walter
  2009-02-01  9:36             ` Cord Walter
  0 siblings, 1 reply; 9+ messages in thread
From: Cord Walter @ 2009-01-31 23:18 UTC (permalink / raw)
  To: netdev

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
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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: pcnet_cs: fix misuse of the equality operator.
  2009-01-31 23:18           ` pcnet_cs: fix misuse of the equality operator Cord Walter
@ 2009-02-01  9:36             ` Cord Walter
  2009-02-01  9:43               ` David Miller
  0 siblings, 1 reply; 9+ messages in thread
From: Cord Walter @ 2009-02-01  9:36 UTC (permalink / raw)
  To: netdev

-----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-----

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: pcnet_cs: fix misuse of the equality operator.
  2009-02-01  9:36             ` Cord Walter
@ 2009-02-01  9:43               ` David Miller
  2009-02-01 10:38                 ` pcnet_cs: fix misuse of the equality operator. - 3rd try Cord Walter
  2009-02-03 10:59                 ` [PATCH] pcnet_cs:fix misuse of the equality operator Cord Walter
  0 siblings, 2 replies; 9+ messages in thread
From: David Miller @ 2009-02-01  9:43 UTC (permalink / raw)
  To: cord.walter; +Cc: netdev

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.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: pcnet_cs: fix misuse of the equality operator. - 3rd try...
  2009-02-01  9:43               ` David Miller
@ 2009-02-01 10:38                 ` Cord Walter
  2009-02-03 10:59                 ` [PATCH] pcnet_cs:fix misuse of the equality operator Cord Walter
  1 sibling, 0 replies; 9+ messages in thread
From: Cord Walter @ 2009-02-01 10:38 UTC (permalink / raw)
  To: netdev

[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;


^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH] pcnet_cs:fix misuse of the equality operator.
  2009-02-01  9:43               ` David Miller
  2009-02-01 10:38                 ` pcnet_cs: fix misuse of the equality operator. - 3rd try Cord Walter
@ 2009-02-03 10:59                 ` Cord Walter
  2009-02-03 23:14                   ` David Miller
  1 sibling, 1 reply; 9+ messages in thread
From: Cord Walter @ 2009-02-03 10:59 UTC (permalink / raw)
  To: netdev


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;



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] pcnet_cs:fix misuse of the equality operator.
  2009-02-03 10:59                 ` [PATCH] pcnet_cs:fix misuse of the equality operator Cord Walter
@ 2009-02-03 23:14                   ` David Miller
  0 siblings, 0 replies; 9+ messages in thread
From: David Miller @ 2009-02-03 23:14 UTC (permalink / raw)
  To: cord.walter; +Cc: netdev

From: Cord Walter <cord.walter@gmx.de>
Date: Tue, 03 Feb 2009 11:59:47 +0100

> 
> pcnet_cs:
> 	fix misuse of the equality operator.
> 
> 
> Signed-off-by: Cord Walter <qord@cwalter.net>
> Signed-off-by: Komuro <komurojun-mbn@nifty.com>

Applied, thanks.

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2009-02-03 23:14 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-20 23:46 axnet_cs / pcnet_cs: moving PCMCIA_DEVICE_PROD_ID for Netgear FA411 Cord Walter
2008-11-21 12:48 ` Komuro
2008-11-21 14:10   ` Cord Walter
     [not found]     ` <20081124160959.b02ff889.komurojun-mbn@nifty.com>
     [not found]       ` <492BE6DE.9020903@gmx.de>
     [not found]         ` <20090131071342.2b45cbe8.komurojun-mbn@nifty.com>
2009-01-31 23:18           ` pcnet_cs: fix misuse of the equality operator Cord Walter
2009-02-01  9:36             ` Cord Walter
2009-02-01  9:43               ` David Miller
2009-02-01 10:38                 ` pcnet_cs: fix misuse of the equality operator. - 3rd try Cord Walter
2009-02-03 10:59                 ` [PATCH] pcnet_cs:fix misuse of the equality operator Cord Walter
2009-02-03 23:14                   ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).