From f0ec0f4bf706c6487f92950c0b66069cd777e730 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 13 Mar 2023 21:26:06 +0300 Subject: [PATCH] r8169: remove devices supported by r8168 Users often report problems with in-kernel r8169 on devices which are supported by not upstream r8168 (e.g.: https://t.me/rosalinux/178305) It does not have any blobs inside it, let's build it as a binary kernel module and ship it out of the box. { 0x0001, 0x8168, PCI_ANY_ID, 0x2410 } is removed from here but is added into r8168, other devices are just remove from here because they exist in r8168. --- drivers/net/ethernet/realtek/r8169_main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index cabed1b7b45e..11dc6fcd2185 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -140,24 +140,24 @@ static const struct { }; static const struct pci_device_id rtl8169_pci_tbl[] = { - { PCI_VDEVICE(REALTEK, 0x2502) }, - { PCI_VDEVICE(REALTEK, 0x2600) }, +// { PCI_VDEVICE(REALTEK, 0x2502) }, +// { PCI_VDEVICE(REALTEK, 0x2600) }, { PCI_VDEVICE(REALTEK, 0x8129) }, { PCI_VDEVICE(REALTEK, 0x8136), RTL_CFG_NO_GBIT }, - { PCI_VDEVICE(REALTEK, 0x8161) }, +// { PCI_VDEVICE(REALTEK, 0x8161) }, { PCI_VDEVICE(REALTEK, 0x8162) }, { PCI_VDEVICE(REALTEK, 0x8167) }, - { PCI_VDEVICE(REALTEK, 0x8168) }, - { PCI_VDEVICE(NCUBE, 0x8168) }, +// { PCI_VDEVICE(REALTEK, 0x8168) }, + { PCI_VDEVICE(NCUBE, 0x8168) }, /* seems to be very rare: https://linux-hardware.org/?view=search&vendorid=10ff */ { PCI_VDEVICE(REALTEK, 0x8169) }, - { PCI_VENDOR_ID_DLINK, 0x4300, - PCI_VENDOR_ID_DLINK, 0x4b10, 0, 0 }, - { PCI_VDEVICE(DLINK, 0x4300) }, +// { PCI_VENDOR_ID_DLINK, 0x4300, +// PCI_VENDOR_ID_DLINK, 0x4b10, 0, 0 }, +// { PCI_VDEVICE(DLINK, 0x4300) }, { PCI_VDEVICE(DLINK, 0x4302) }, { PCI_VDEVICE(AT, 0xc107) }, { PCI_VDEVICE(USR, 0x0116) }, { PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0024 }, - { 0x0001, 0x8168, PCI_ANY_ID, 0x2410 }, +// { 0x0001, 0x8168, PCI_ANY_ID, 0x2410 }, { PCI_VDEVICE(REALTEK, 0x8125) }, { PCI_VDEVICE(REALTEK, 0x3000) }, {} -- 2.35.2