Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0e08fac authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller
Browse files

netxen: add PCI IDs for new chip 



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

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a9ac07de

drivers/net/netxen/netxen_nic.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -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)	\

drivers/net/netxen/netxen_nic_ethtool.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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;

drivers/net/netxen/netxen_nic_main.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -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,}

};

};