> Patch looks obivously okay, but what about linewrapping the comment before > it hits the 80char limit? > > And please kill the broken workaround now that the driver recognizes > the wrong vendor ID correctly. Thanks for the comment. I have modified the patch as you requested (see below). Also, the link in the original message was incorrect. The correct link for the current workaround is "http://lxr.linux.no/source/arch/ppc/kernel/pci.c?a=ppc#L87";. I will contact the maintainer of that code for removal of the workaround. --- /usr/src/linux-2.6.1/drivers/net/pcnet32.c 2004-01-26 10:46:33.000000000 -0600 +++ pcnet32/pcnet32.c 2004-02-02 12:59:52.327100816 -0600 @@ -58,6 +58,12 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELD static struct pci_device_id pcnet32_pci_tbl[] = { { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + /* + * Adapters that were sold with IBM's RS/6000 or pSeries hardware have the + * incorrect vendor id in non-ppc hardware. + */ + { PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_AMD_LANCE, PCI_ANY_ID, PCI_ANY_ID, + PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, 0}, { 0, } }; Thanks, Jon Mason jonmason@us.ibm.com Software Engineer Phone:(512)838.4162 Linux eServer I/O Fax: (512)838.3509 - : send the line "unsubscribe linux-net" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
