| title: | patch netxen add pci ids for new chip patch a |
|
This is a note to let you know that we have just queued up the patch titled
Subject: netxen: add PCI IDs for new chip
to the 2.6.32-stable tree. Its filename is
netxen-add-pci-ids-for-new-chip.patch
A git repo of this tree can be found at
rel="nofollow" www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
From f0e08fac06596a760f074c08521550d93b96336e Mon Sep 17 00:00:00 2001
From: Dhananjay Phadke <dhananjay@xxxxxxxxxx
Date: Sat, 24 Oct 2009 16:04:00 +0000
Subject: netxen: add PCI IDs for new chip
From: Dhananjay Phadke <dhananjay@xxxxxxxxxx
commit f0e08fac06596a760f074c08521550d93b96336e upstream.
Add PCI vendor and device IDs for QLE8240 and QLE8242
CNA devices.
Signed-off-by: Dhananjay Phadke <dhananjay@xxxxxxxxxx
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx
Signed-off-by: Brandon Philips <bphilips@xxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx
---
drivers/net/netxen/netxen_nic.h | 2 --
drivers/net/netxen/netxen_nic_ethtool.c | 4 ++--
drivers/net/netxen/netxen_nic_main.c | 6 ++++++
3 files changed, 8 insertions(+), 4 deletions(-)
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -690,8 +690,8 @@ static int netxen_nic_reg_test(struct ne
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;
--- 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)
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -87,6 +87,11 @@ static void netxen_config_indev_addr(str
#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),
@@ -97,6 +102,7 @@ static struct pci_device_id netxen_pci_t
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,}
};
Patches currently in stable-queue which might be from dhananjay@xxxxxxxxxx are
queue-2.6.32/netxen-add-pci-ids-for-new-chip.patch
--
To unsubscribe from this list: send the line "unsubscribe stable-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at rel="nofollow" vger.kernel.org/majordomo-info.html vger.kernel.org/majordomo-info.html
|
