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

Configure Feed

Select the types of activity you want to include in your feed.

net: intel: fix PCI device ID conflict between i40e and ipw2200

The ID 8086:104f is matched by both i40e and ipw2200. The same device
ID should not be in more than one driver, because in that case, which
driver is used is unpredictable. Fix this by taking advantage of the
fact that i40e devices use PCI_CLASS_NETWORK_ETHERNET and ipw2200
devices use PCI_CLASS_NETWORK_OTHER to differentiate the devices.

Fixes: 2e45d3f4677a ("i40e: Add support for X710 B/P & SFP+ cards")
Cc: stable@vger.kernel.org
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Link: https://patch.msgid.link/20260210021235.16315-1-enelsonmoore@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Ethan Nelson-Moore and committed by
Jakub Kicinski d03e0944 ed6788c5

+14 -2
+7 -1
drivers/net/ethernet/intel/i40e/i40e_main.c
··· 75 75 {PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T4), 0}, 76 76 {PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T_BC), 0}, 77 77 {PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_SFP), 0}, 78 - {PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_B), 0}, 78 + /* 79 + * This ID conflicts with ipw2200, but the devices can be differentiated 80 + * because i40e devices use PCI_CLASS_NETWORK_ETHERNET and ipw2200 81 + * devices use PCI_CLASS_NETWORK_OTHER. 82 + */ 83 + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_10G_B), 84 + PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, 0}, 79 85 {PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_X722), 0}, 80 86 {PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_X722), 0}, 81 87 {PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X722), 0},
+7 -1
drivers/net/wireless/intel/ipw2x00/ipw2200.c
··· 11387 11387 {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2754, 0, 0, 0}, 11388 11388 {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2761, 0, 0, 0}, 11389 11389 {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2762, 0, 0, 0}, 11390 - {PCI_VDEVICE(INTEL, 0x104f), 0}, 11390 + /* 11391 + * This ID conflicts with i40e, but the devices can be differentiated 11392 + * because i40e devices use PCI_CLASS_NETWORK_ETHERNET and ipw2200 11393 + * devices use PCI_CLASS_NETWORK_OTHER. 11394 + */ 11395 + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x104f), 11396 + PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0}, 11391 11397 {PCI_VDEVICE(INTEL, 0x4220), 0}, /* BG */ 11392 11398 {PCI_VDEVICE(INTEL, 0x4221), 0}, /* BG */ 11393 11399 {PCI_VDEVICE(INTEL, 0x4223), 0}, /* ABG */