[PATCH] r8169: avoid conflict between revisions 2 and 3 of the Linksys EG1032 (86f0cd50) · Commits · 戴 / test

Both revisions share the same PCI device ID and vendor ID but revision 2 of the device uses SysKonnect's chipset whereas revision 3 of the device uses Realtek's 8169 chipset. Credit goes to Christiaan Lutzer <mythtv.lutzer@gmail.com> for reporting the issue and giving the actual value for the different revisions. Signed-off-by:

Francois Romieu <romieu@fr.zoreil.com> Signed-off-by:

Jeff Garzik <jgarzik@pobox.com>

drivers/net/r8169.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -186,8 +186,8 @@ const static struct {
		static struct pci_device_id rtl8169_pci_tbl[] = {
		{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), },
		{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), },
		{ PCI_DEVICE(PCI_VENDOR_ID_LINKSYS, 0x1032), },
		{ PCI_DEVICE(0x16ec, 0x0116), },
		{ PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0024, },
		{0,},
		};

drivers/net/skge.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,8 +79,8 @@ static const struct pci_device_id skge_id_table[] = {
		{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4320) },
		{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5005) }, /* Belkin */
		{ PCI_DEVICE(PCI_VENDOR_ID_CNET, PCI_DEVICE_ID_CNET_GIGACARD) },
		{ PCI_DEVICE(PCI_VENDOR_ID_LINKSYS, PCI_DEVICE_ID_LINKSYS_EG1032) },
		{ PCI_DEVICE(PCI_VENDOR_ID_LINKSYS, PCI_DEVICE_ID_LINKSYS_EG1064) },
		{ PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0015, },
		{ 0 }
		};
		MODULE_DEVICE_TABLE(pci, skge_id_table);

Admin message