2007-02-23 11:32:26

by Mark Brown

Subject: natsemi: Fix detection of vanilla natsemi cards

Bob Tracy <[email protected]> reported that the addition of support
for Aculab E1/T1 cPCI carrier cards broke detection of vanilla natsemi
cards. This patch fixes that: the problem is that the driver-specific
data in the PCI device table is an index into a second table and this
had not been updated for the vanilla cards.

This patch fixes the problem minimally.

Signed-Off-By: Mark Brown <[email protected]>

--- linux.orig/drivers/net/natsemi.c 2007-02-23 11:13:03.000000000 +0000
+++ linux/drivers/net/natsemi.c 2007-02-23 11:12:00.000000000 +0000
@@ -260,7 +260,7 @@

static const struct pci_device_id natsemi_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_NS, 0x0020, 0x12d9, 0x000c, 0, 0, 0 },
- { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }
+ { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
{ } /* terminate list */
};
MODULE_DEVICE_TABLE(pci, natsemi_pci_tbl);

--
"You grabbed my hand and we fell into it, like a daydream - or a fever."

2007-02-23 13:47:44

by Bob Tracy

Subject: Re: natsemi: Fix detection of vanilla natsemi cards

Mark Brown wrote:
> (Re: vanilla natsemi card detection problem)
> This patch fixes the problem minimally.
>
> Signed-Off-By: Mark Brown <[email protected]>
>
> --- linux.orig/drivers/net/natsemi.c 2007-02-23 11:13:03.000000000 +0000
> +++ linux/drivers/net/natsemi.c 2007-02-23 11:12:00.000000000 +0000
> @@ -260,7 +260,7 @@
>
> static const struct pci_device_id natsemi_pci_tbl[] __devinitdata = {
> { PCI_VENDOR_ID_NS, 0x0020, 0x12d9, 0x000c, 0, 0, 0 },
> - { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }
> + { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
> { } /* terminate list */
> };
> MODULE_DEVICE_TABLE(pci, natsemi_pci_tbl);
>

ACK except for a missing comma at the end of the line being replaced,
which prevents the patch from applying cleanly. Otherwise, this fixes
the problem I was having. Thanks!

--
-----------------------------------------------------------------------
Bob Tracy WTO + WIPO = DMCA? http://www.anti-dmca.org
[email protected]
-----------------------------------------------------------------------

2007-02-23 14:27:08

by Mark Brown

Subject: Re: natsemi: Fix detection of vanilla natsemi cards

On Fri, Feb 23, 2007 at 07:47:40AM -0600, Bob Tracy wrote:

> ACK except for a missing comma at the end of the line being replaced,
> which prevents the patch from applying cleanly. Otherwise, this fixes
> the problem I was having. Thanks!

Aargh.

--- linux.orig/drivers/net/natsemi.c 2007-02-23 11:13:03.000000000 +0000
+++ linux/drivers/net/natsemi.c 2007-02-23 11:12:00.000000000 +0000
@@ -260,7 +260,7 @@

static const struct pci_device_id natsemi_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_NS, 0x0020, 0x12d9, 0x000c, 0, 0, 0 },
- { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
{ } /* terminate list */
};
MODULE_DEVICE_TABLE(pci, natsemi_pci_tbl);

--
"You grabbed my hand and we fell into it, like a daydream - or a fever."