[SRU][Trusty][PATCH 3/6] UBUNTU: SAUCE: i40e_bpo: Don't probe for NICs supported by the in-tree driver

Juerg Haefliger juerg.haefliger at canonical.com
Fri Aug 31 11:29:18 UTC 2018


BugLink: https://bugs.launchpad.net/bugs/1789215

Only load the i40e_bpo driver for devices that are not supported by the
in-tree i40e driver, so remove these device IDs from the i40e_bpo driver's
device table.

Signed-off-by: Juerg Haefliger <juergh at canonical.com>
---
 ubuntu/i40e/i40e_main.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ubuntu/i40e/i40e_main.c b/ubuntu/i40e/i40e_main.c
index 0456b9d5d99d..2781df5fb2c4 100644
--- a/ubuntu/i40e/i40e_main.c
+++ b/ubuntu/i40e/i40e_main.c
@@ -75,13 +75,17 @@ static int i40e_veb_get_bw_info(struct i40e_veb *veb);
  *   Class, Class Mask, private data (not used) }
  */
 static const struct pci_device_id i40e_pci_tbl[] = {
-	{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_XL710), 0},
-	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QEMU), 0},
-	{PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_B), 0},
-	{PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_C), 0},
-	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_A), 0},
-	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_B), 0},
-	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C), 0},
+/*
+ * Exclude the following devices that are supported by the in-kernel driver
+ *
+ *	{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_XL710), 0},
+ *	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QEMU), 0},
+ *	{PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_B), 0},
+ *	{PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_C), 0},
+ *	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_A), 0},
+ *	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_B), 0},
+ *	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C), 0},
+ */
 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T), 0},
 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T4), 0},
 	{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0},
-- 
2.17.1





More information about the kernel-team mailing list