qlcnic: Add identifying string for 83xx adapter

o Added identifying strings for 8300 Series of adapters.
o updated PCI_VENDOR_ID_QLOGIC and PCI_DEVICE_ID_824X for 8200
  Series adapter.

Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 1310b7b6bc5c76572390f16300304b10ec40efcc..264d5a4f81538a23653c370a7d85df18617c09be 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -156,25 +156,112 @@ static const u32 qlcnic_reg_tbl[] = {
 };
 
 static const struct qlcnic_board_info qlcnic_boards[] = {
-       {0x1077, 0x8020, 0x1077, 0x203,
-        "8200 Series Single Port 10GbE Converged Network Adapter"
-        "(TCP/IP Networking)"},
-       {0x1077, 0x8020, 0x1077, 0x207,
-        "8200 Series Dual Port 10GbE Converged Network Adapter"
-        "(TCP/IP Networking)"},
-       {0x1077, 0x8020, 0x1077, 0x20b,
-        "3200 Series Dual Port 10Gb Intelligent Ethernet Adapter"},
-       {0x1077, 0x8020, 0x1077, 0x20c,
-        "3200 Series Quad Port 1Gb Intelligent Ethernet Adapter"},
-       {0x1077, 0x8020, 0x1077, 0x20f,
-        "3200 Series Single Port 10Gb Intelligent Ethernet Adapter"},
-       {0x1077, 0x8020, 0x103c, 0x3733,
-        "NC523SFP 10Gb 2-port Server Adapter"},
-       {0x1077, 0x8020, 0x103c, 0x3346,
-        "CN1000Q Dual Port Converged Network Adapter"},
-       {0x1077, 0x8020, 0x1077, 0x210,
-        "QME8242-k 10GbE Dual Port Mezzanine Card"},
-       {0x1077, 0x8020, 0x0, 0x0, "cLOM8214 1/10GbE Controller"},
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE834X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x24e,
+         "8300 Series Dual Port 10GbE Converged Network Adapter "
+         "(TCP/IP Networking)" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE834X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x243,
+         "8300 Series Single Port 10GbE Converged Network Adapter "
+         "(TCP/IP Networking)" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE834X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x24a,
+         "8300 Series Dual Port 10GbE Converged Network Adapter "
+         "(TCP/IP Networking)" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE834X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x246,
+         "8300 Series Dual Port 10GbE Converged Network Adapter "
+         "(TCP/IP Networking)" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE834X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x252,
+         "8300 Series Dual Port 10GbE Converged Network Adapter "
+         "(TCP/IP Networking)" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE834X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x26e,
+         "8300 Series Dual Port 10GbE Converged Network Adapter "
+         "(TCP/IP Networking)" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE834X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x260,
+         "8300 Series Dual Port 10GbE Converged Network Adapter "
+         "(TCP/IP Networking)" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE834X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x266,
+         "8300 Series Single Port 10GbE Converged Network Adapter "
+         "(TCP/IP Networking)" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE834X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x269,
+         "8300 Series Dual Port 10GbE Converged Network Adapter "
+         "(TCP/IP Networking)" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE834X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x271,
+         "8300 Series Dual Port 10GbE Converged Network Adapter "
+         "(TCP/IP Networking)" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE834X,
+         0x0, 0x0, "8300 Series 1/10GbE Controller" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE824X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x203,
+         "8200 Series Single Port 10GbE Converged Network Adapter"
+         "(TCP/IP Networking)" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE824X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x207,
+         "8200 Series Dual Port 10GbE Converged Network Adapter"
+         "(TCP/IP Networking)" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE824X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x20b,
+         "3200 Series Dual Port 10Gb Intelligent Ethernet Adapter" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE824X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x20c,
+         "3200 Series Quad Port 1Gb Intelligent Ethernet Adapter" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE824X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x20f,
+         "3200 Series Single Port 10Gb Intelligent Ethernet Adapter" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE824X,
+         0x103c, 0x3733,
+         "NC523SFP 10Gb 2-port Server Adapter" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE824X,
+         0x103c, 0x3346,
+         "CN1000Q Dual Port Converged Network Adapter" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE824X,
+         PCI_VENDOR_ID_QLOGIC,
+         0x210,
+         "QME8242-k 10GbE Dual Port Mezzanine Card" },
+       { PCI_VENDOR_ID_QLOGIC,
+         PCI_DEVICE_ID_QLOGIC_QLE824X,
+         0x0, 0x0, "cLOM8214 1/10GbE Controller" },
 };
 
 #define NUM_SUPPORTED_BOARDS ARRAY_SIZE(qlcnic_boards)