Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] r8169: avoid conflict between revisions 2 and 3 of the Linksys EG1032

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>

authored by

Francois Romieu and committed by
Jeff Garzik
86f0cd50 815f62bf

+2 -2
+1 -1
drivers/net/r8169.c
··· 186 186 static struct pci_device_id rtl8169_pci_tbl[] = { 187 187 { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), }, 188 188 { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), }, 189 - { PCI_DEVICE(PCI_VENDOR_ID_LINKSYS, 0x1032), }, 190 189 { PCI_DEVICE(0x16ec, 0x0116), }, 190 + { PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0024, }, 191 191 {0,}, 192 192 }; 193 193
+1 -1
drivers/net/skge.c
··· 79 79 { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4320) }, 80 80 { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5005) }, /* Belkin */ 81 81 { PCI_DEVICE(PCI_VENDOR_ID_CNET, PCI_DEVICE_ID_CNET_GIGACARD) }, 82 - { PCI_DEVICE(PCI_VENDOR_ID_LINKSYS, PCI_DEVICE_ID_LINKSYS_EG1032) }, 83 82 { PCI_DEVICE(PCI_VENDOR_ID_LINKSYS, PCI_DEVICE_ID_LINKSYS_EG1064) }, 83 + { PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0015, }, 84 84 { 0 } 85 85 }; 86 86 MODULE_DEVICE_TABLE(pci, skge_id_table);