lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netxen: add PCI IDs for new chip

Browse Source 
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>
This commit is contained in:
Dhananjay Phadke
2009-10-24 16:04:00 +00:00
committed by David S. Miller
parent a9ac07deeb
commit f0e08fac06
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/netxen/netxen_nic.h
View File

@@ -74,8 +74,6 @@
#define NETXEN_FLASH_TOTAL_SIZE (NETXEN_NUM_FLASH_SECTORS \ #define NETXEN_FLASH_TOTAL_SIZE (NETXEN_NUM_FLASH_SECTORS \
* NETXEN_FLASH_SECTOR_SIZE) * NETXEN_FLASH_SECTOR_SIZE)
#define PHAN_VENDOR_ID 0x4040
#define RCV_DESC_RINGSIZE(rds_ring) \ #define RCV_DESC_RINGSIZE(rds_ring) \
(sizeof(struct rcv_desc) * (rds_ring)->num_desc) (sizeof(struct rcv_desc) * (rds_ring)->num_desc)
#define RCV_BUFF_RINGSIZE(rds_ring) \ #define RCV_BUFF_RINGSIZE(rds_ring) \

2
drivers/net/netxen/netxen_nic_ethtool.c
View File

@@ -688,7 +688,7 @@ static int netxen_nic_reg_test(struct net_device *dev)
u32 data_read, data_written; u32 data_read, data_written;
data_read = NXRD32(adapter, NETXEN_PCIX_PH_REG(0)); data_read = NXRD32(adapter, NETXEN_PCIX_PH_REG(0));
if ((data_read & 0xffff) != PHAN_VENDOR_ID) if ((data_read & 0xffff) != adapter->pdev->vendor)
return 1; return 1;
data_written = (u32)0xa5a5a5a5; data_written = (u32)0xa5a5a5a5;

6
drivers/net/netxen/netxen_nic_main.c
View File

@@ -92,6 +92,11 @@ static void netxen_config_indev_addr(struct net_device *dev, unsigned long);
#define ENTRY(device) \ #define ENTRY(device) \
{PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \ {PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \
.class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0} .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 = { static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
ENTRY(PCI_DEVICE_ID_NX2031_10GXSR), 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_MGMT),
ENTRY(PCI_DEVICE_ID_NX2031_XG_MGMT2), ENTRY(PCI_DEVICE_ID_NX2031_XG_MGMT2),
ENTRY(PCI_DEVICE_ID_NX3031), ENTRY(PCI_DEVICE_ID_NX3031),
ENTRY2(PCI_DEVICE_ID_QLOGIC_QLE824X),
{0,} {0,}
}; };