aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_main.c
diff options
context:
space:
mode:
authorDhananjay Phadke <dhananjay@netxen.com>2008-07-21 22:44:02 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-07-22 17:51:23 -0400
commite4c93c817ce650401db42db6c869cf7688217ff4 (patch)
tree280ef8bd2768407ab140367de6bf9980b3f5c9d9 /drivers/net/netxen/netxen_nic_main.c
parent623621b07ebc5b72e0bdfa4a50bbb28f4587de0c (diff)
netxen: add defs for new chip/boards
Add macros for new chip revision and board configurations. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 0ec6e7ebf90f..192a22f89570 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -83,6 +83,7 @@ static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
83 ENTRY(0x0005), 83 ENTRY(0x0005),
84 ENTRY(0x0024), 84 ENTRY(0x0024),
85 ENTRY(0x0025), 85 ENTRY(0x0025),
86 ENTRY(0x0100),
86 {0,} 87 {0,}
87}; 88};
88 89
@@ -526,7 +527,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
526 adapter->crb_addr_cmd_consumer = crb_cmd_consumer[adapter->portnum]; 527 adapter->crb_addr_cmd_consumer = crb_cmd_consumer[adapter->portnum];
527 netxen_nic_update_cmd_producer(adapter, 0); 528 netxen_nic_update_cmd_producer(adapter, 0);
528 netxen_nic_update_cmd_consumer(adapter, 0); 529 netxen_nic_update_cmd_consumer(adapter, 0);
529 writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_HOST_CMD_ADDR_LO));
530 530
531 if (netxen_is_flash_supported(adapter) == 0 && 531 if (netxen_is_flash_supported(adapter) == 0 &&
532 netxen_get_flash_mac_addr(adapter, mac_addr) == 0) 532 netxen_get_flash_mac_addr(adapter, mac_addr) == 0)
@@ -1099,7 +1099,7 @@ netxen_handle_int(struct netxen_adapter *adapter)
1099 napi_schedule(&adapter->napi); 1099 napi_schedule(&adapter->napi);
1100} 1100}
1101 1101
1102irqreturn_t netxen_intr(int irq, void *data) 1102static irqreturn_t netxen_intr(int irq, void *data)
1103{ 1103{
1104 struct netxen_adapter *adapter = data; 1104 struct netxen_adapter *adapter = data;
1105 u32 our_int = 0; 1105 u32 our_int = 0;
@@ -1120,7 +1120,7 @@ irqreturn_t netxen_intr(int irq, void *data)
1120 return IRQ_HANDLED; 1120 return IRQ_HANDLED;
1121} 1121}
1122 1122
1123irqreturn_t netxen_msi_intr(int irq, void *data) 1123static irqreturn_t netxen_msi_intr(int irq, void *data)
1124{ 1124{
1125 struct netxen_adapter *adapter = data; 1125 struct netxen_adapter *adapter = data;
1126 1126