[xenial 5/7] UBUNTU: SAUCE: bnxt_en_bpo: Remove PCI_IDs handled by the regular driver

Juerg Haefliger juerg.haefliger at canonical.com
Thu Aug 17 06:24:55 UTC 2017


BugLink: http://bugs.launchpad.net/bugs/1711056

The backported bnxt_en_bpo driver should only load for NICs that are not
handled by the current bnxt_en driver.

Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
---
 ubuntu/bnxt/bnxt.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/ubuntu/bnxt/bnxt.c b/ubuntu/bnxt/bnxt.c
index 4ce9b64f1a7f..f7a4dd587dd8 100644
--- a/ubuntu/bnxt/bnxt.c
+++ b/ubuntu/bnxt/bnxt.c
@@ -107,15 +107,11 @@ MODULE_PARM_DESC(num_vfs, " Number of supported virtual functions (0 means sriov
 
 enum board_idx {
 	BCM57301,
-	BCM57302,
-	BCM57304,
 	BCM57417_NPAR,
 	BCM58700,
 	BCM57311,
 	BCM57312,
 	BCM57402,
-	BCM57404,
-	BCM57406,
 	BCM57402_NPAR,
 	BCM57407,
 	BCM57412,
@@ -143,15 +139,11 @@ static const struct {
 	char *name;
 } board_info[] = {
 	{ "Broadcom BCM57301 NetXtreme-C 10Gb Ethernet" },
-	{ "Broadcom BCM57302 NetXtreme-C 10Gb/25Gb Ethernet" },
-	{ "Broadcom BCM57304 NetXtreme-C 10Gb/25Gb/40Gb/50Gb Ethernet" },
 	{ "Broadcom BCM57417 NetXtreme-E Ethernet Partition" },
 	{ "Broadcom BCM58700 Nitro 1Gb/2.5Gb/10Gb Ethernet" },
 	{ "Broadcom BCM57311 NetXtreme-C 10Gb Ethernet" },
 	{ "Broadcom BCM57312 NetXtreme-C 10Gb/25Gb Ethernet" },
 	{ "Broadcom BCM57402 NetXtreme-E 10Gb Ethernet" },
-	{ "Broadcom BCM57404 NetXtreme-E 10Gb/25Gb Ethernet" },
-	{ "Broadcom BCM57406 NetXtreme-E 10GBase-T Ethernet" },
 	{ "Broadcom BCM57402 NetXtreme-E Ethernet Partition" },
 	{ "Broadcom BCM57407 NetXtreme-E 10GBase-T Ethernet" },
 	{ "Broadcom BCM57412 NetXtreme-E 10Gb Ethernet" },
@@ -177,15 +169,11 @@ static const struct {
 static const struct pci_device_id bnxt_pci_tbl[] = {
 	{ PCI_VDEVICE(BROADCOM, 0x16c0), .driver_data = BCM57417_NPAR },
 	{ PCI_VDEVICE(BROADCOM, 0x16c8), .driver_data = BCM57301 },
-	{ PCI_VDEVICE(BROADCOM, 0x16c9), .driver_data = BCM57302 },
-	{ PCI_VDEVICE(BROADCOM, 0x16ca), .driver_data = BCM57304 },
 	{ PCI_VDEVICE(BROADCOM, 0x16cc), .driver_data = BCM57417_NPAR },
 	{ PCI_VDEVICE(BROADCOM, 0x16cd), .driver_data = BCM58700 },
 	{ PCI_VDEVICE(BROADCOM, 0x16ce), .driver_data = BCM57311 },
 	{ PCI_VDEVICE(BROADCOM, 0x16cf), .driver_data = BCM57312 },
 	{ PCI_VDEVICE(BROADCOM, 0x16d0), .driver_data = BCM57402 },
-	{ PCI_VDEVICE(BROADCOM, 0x16d1), .driver_data = BCM57404 },
-	{ PCI_VDEVICE(BROADCOM, 0x16d2), .driver_data = BCM57406 },
 	{ PCI_VDEVICE(BROADCOM, 0x16d4), .driver_data = BCM57402_NPAR },
 	{ PCI_VDEVICE(BROADCOM, 0x16d5), .driver_data = BCM57407 },
 	{ PCI_VDEVICE(BROADCOM, 0x16d6), .driver_data = BCM57412 },
@@ -209,8 +197,6 @@ static const struct pci_device_id bnxt_pci_tbl[] = {
 	{ PCI_VDEVICE(BROADCOM, 0x1614), .driver_data = BCM57454 },
 #ifdef CONFIG_BNXT_SRIOV
 	{ PCI_VDEVICE(BROADCOM, 0x16c1), .driver_data = NETXTREME_E_VF },
-	{ PCI_VDEVICE(BROADCOM, 0x16cb), .driver_data = NETXTREME_C_VF },
-	{ PCI_VDEVICE(BROADCOM, 0x16d3), .driver_data = NETXTREME_E_VF },
 	{ PCI_VDEVICE(BROADCOM, 0x16dc), .driver_data = NETXTREME_E_VF },
 	{ PCI_VDEVICE(BROADCOM, 0x16e1), .driver_data = NETXTREME_C_VF },
 	{ PCI_VDEVICE(BROADCOM, 0x16e5), .driver_data = NETXTREME_C_VF },
-- 
2.11.0





More information about the kernel-team mailing list