netxen: add PCI IDs for new chip

Add PCI vendor and device IDs for QLE8240 and QLE8242
CNA devices.

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 5ba923bd9d779c2c078afe4f8853a1c60efeec75..5d0810f28a01e4224a46e7d3cfa28938f33729b5 100644 (file)
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -74,8 +74,6 @@
 #define NETXEN_FLASH_TOTAL_SIZE  (NETXEN_NUM_FLASH_SECTORS \
                                        * NETXEN_FLASH_SECTOR_SIZE)
 
-#define PHAN_VENDOR_ID 0x4040
-
 #define RCV_DESC_RINGSIZE(rds_ring)    \
        (sizeof(struct rcv_desc) * (rds_ring)->num_desc)
 #define RCV_BUFF_RINGSIZE(rds_ring)    \

diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index a3b18e0c9670ab45c186ac5b1d36f6c9adbd4763..c86095eb5d9e106a10fd9b1a993a1b12767534da 100644 (file)
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -688,8 +688,8 @@ static int netxen_nic_reg_test(struct net_device *dev)
        u32 data_read, data_written;
 
        data_read = NXRD32(adapter, NETXEN_PCIX_PH_REG(0));
-       if ((data_read & 0xffff) != PHAN_VENDOR_ID)
-       return 1;
+       if ((data_read & 0xffff) != adapter->pdev->vendor)
+               return 1;
 
        data_written = (u32)0xa5a5a5a5;
 

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index fe4059ff82f0d6500da3e3a4c382e49474b4cbca..53e728907d5a3d2c29e8705b6777be5517ef8832 100644 (file)
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -92,6 +92,11 @@ static void netxen_config_indev_addr(struct net_device *dev, unsigned long);
 #define ENTRY(device) \
        {PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \
        .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0}
+#define ENTRY2(device) \
+       {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, (device)), \
+       .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0}
+
+#define PCI_DEVICE_ID_QLOGIC_QLE824X   0x8020
 
 static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
        ENTRY(PCI_DEVICE_ID_NX2031_10GXSR),
@@ -102,6 +107,7 @@ static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
        ENTRY(PCI_DEVICE_ID_NX2031_XG_MGMT),
        ENTRY(PCI_DEVICE_ID_NX2031_XG_MGMT2),
        ENTRY(PCI_DEVICE_ID_NX3031),
+       ENTRY2(PCI_DEVICE_ID_QLOGIC_QLE824X),
        {0,}
 };