LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* natsemi: Fix detection of vanilla natsemi cards
@ 2007-02-25 15:37 Mark Brown
2007-02-27 9:31 ` Jeff Garzik
0 siblings, 1 reply; 5+ messages in thread
From: Mark Brown @ 2007-02-25 15:37 UTC (permalink / raw)
To: Andrew Morton, Tim Hockin, Jeff Garzik; +Cc: Adrian Bunk, netdev, linux-kernel
Bob Tracy <rct@gherkin.frus.com> 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
ta 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 <broonie@sirena.org.uk>
--- 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."
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: natsemi: Fix detection of vanilla natsemi cards
2007-02-25 15:37 natsemi: Fix detection of vanilla natsemi cards Mark Brown
@ 2007-02-27 9:31 ` Jeff Garzik
0 siblings, 0 replies; 5+ messages in thread
From: Jeff Garzik @ 2007-02-27 9:31 UTC (permalink / raw)
To: Andrew Morton, Tim Hockin, Jeff Garzik, Adrian Bunk, netdev,
linux-kernel
Mark Brown wrote:
> Bob Tracy <rct@gherkin.frus.com> 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
> ta 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 <broonie@sirena.org.uk>
applied
^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <20070223020920.b9528e0e.akpm@linux-foundation.org>]
* natsemi: Fix detection of vanilla natsemi cards
[not found] <20070223020920.b9528e0e.akpm@linux-foundation.org>
@ 2007-02-23 11:32 ` Mark Brown
2007-02-23 13:47 ` Bob Tracy
0 siblings, 1 reply; 5+ messages in thread
From: Mark Brown @ 2007-02-23 11:32 UTC (permalink / raw)
To: Andrew Morton, Tim Hockin, Jeff Garzik; +Cc: Adrian Bunk, netdev, linux-kernel
Bob Tracy <rct@gherkin.frus.com> 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 <broonie@sirena.org.uk>
--- 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."
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: natsemi: Fix detection of vanilla natsemi cards
2007-02-23 11:32 ` Mark Brown
@ 2007-02-23 13:47 ` Bob Tracy
2007-02-23 14:26 ` Mark Brown
0 siblings, 1 reply; 5+ messages in thread
From: Bob Tracy @ 2007-02-23 13:47 UTC (permalink / raw)
To: Mark Brown
Cc: Andrew Morton, Tim Hockin, Jeff Garzik, Adrian Bunk, netdev,
linux-kernel
Mark Brown wrote:
> (Re: vanilla natsemi card detection problem)
> This patch fixes the problem minimally.
>
> Signed-Off-By: Mark Brown <broonie@sirena.org.uk>
>
> --- 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
rct@frus.com
-----------------------------------------------------------------------
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: natsemi: Fix detection of vanilla natsemi cards
2007-02-23 13:47 ` Bob Tracy
@ 2007-02-23 14:26 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2007-02-23 14:26 UTC (permalink / raw)
To: Bob Tracy
Cc: Andrew Morton, Tim Hockin, Jeff Garzik, Adrian Bunk, netdev,
linux-kernel
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."
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-02-27 9:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-25 15:37 natsemi: Fix detection of vanilla natsemi cards Mark Brown
2007-02-27 9:31 ` Jeff Garzik
[not found] <20070223020920.b9528e0e.akpm@linux-foundation.org>
2007-02-23 11:32 ` Mark Brown
2007-02-23 13:47 ` Bob Tracy
2007-02-23 14:26 ` Mark Brown
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).