Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f0e08fac06596a760f074c08521550d93b96336e

Authored by Dhananjay Phadke
Committed by David S. Miller
1 parent a9ac07deeb
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 3 changed files with 8 additions and 4 deletions Side-by-side Diff

drivers/net/netxen/netxen_nic.h
Diff comments   View file @ f0e08fa
... ... @@ -74,8 +74,6 @@
74 74 #define NETXEN_FLASH_TOTAL_SIZE (NETXEN_NUM_FLASH_SECTORS \
75 75 * NETXEN_FLASH_SECTOR_SIZE)
76 76  
77   -#define PHAN_VENDOR_ID 0x4040
78   -
79 77 #define RCV_DESC_RINGSIZE(rds_ring) \
80 78 (sizeof(struct rcv_desc) * (rds_ring)->num_desc)
81 79 #define RCV_BUFF_RINGSIZE(rds_ring) \
drivers/net/netxen/netxen_nic_ethtool.c
Diff comments   View file @ f0e08fa
... ... @@ -688,8 +688,8 @@
688 688 u32 data_read, data_written;
689 689  
690 690 data_read = NXRD32(adapter, NETXEN_PCIX_PH_REG(0));
691   - if ((data_read & 0xffff) != PHAN_VENDOR_ID)
692   - return 1;
  691 + if ((data_read & 0xffff) != adapter->pdev->vendor)
  692 + return 1;
693 693  
694 694 data_written = (u32)0xa5a5a5a5;
695 695  
drivers/net/netxen/netxen_nic_main.c
Diff comments   View file @ f0e08fa
... ... @@ -92,7 +92,12 @@
92 92 #define ENTRY(device) \
93 93 {PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \
94 94 .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0}
  95 +#define ENTRY2(device) \
  96 + {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, (device)), \
  97 + .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0}
95 98  
  99 +#define PCI_DEVICE_ID_QLOGIC_QLE824X 0x8020
  100 +
96 101 static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
97 102 ENTRY(PCI_DEVICE_ID_NX2031_10GXSR),
98 103 ENTRY(PCI_DEVICE_ID_NX2031_10GCX4),
... ... @@ -102,6 +107,7 @@
102 107 ENTRY(PCI_DEVICE_ID_NX2031_XG_MGMT),
103 108 ENTRY(PCI_DEVICE_ID_NX2031_XG_MGMT2),
104 109 ENTRY(PCI_DEVICE_ID_NX3031),
  110 + ENTRY2(PCI_DEVICE_ID_QLOGIC_QLE824X),
105 111 {0,}
106 112 };
107 113