aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_main.c
diff options
context:
space:
mode:
authorDhananjay Phadke <dhananjay@netxen.com>2009-10-13 01:31:43 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-13 14:48:20 -0400
commit907fa1201c76f426a13bdff5be2747fb62c2353f (patch)
tree2bffcd1f472f03f9a294e0e4b16bbac705b52ba6 /drivers/net/netxen/netxen_nic_main.c
parent47abe35610cbbfb3cc92847efdf588a8be1f5ebc (diff)
netxen: annotate register windowing code
Use common variables crb_win, ocm_win for all revisions of chip. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index b7f607061865..6695e5473027 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -606,7 +606,7 @@ netxen_setup_pci_map(struct netxen_adapter *adapter)
606 * Set the CRB window to invalid. If any register in window 0 is 606 * Set the CRB window to invalid. If any register in window 0 is
607 * accessed it should set the window to 0 and then reset it to 1. 607 * accessed it should set the window to 0 and then reset it to 1.
608 */ 608 */
609 adapter->curr_window = 255; 609 adapter->ahw.crb_win = -1;
610 adapter->ahw.ocm_win = -1; 610 adapter->ahw.ocm_win = -1;
611 611
612 /* remap phys address */ 612 /* remap phys address */
@@ -1437,7 +1437,7 @@ netxen_nic_resume(struct pci_dev *pdev)
1437 if (err) 1437 if (err)
1438 return err; 1438 return err;
1439 1439
1440 adapter->curr_window = 255; 1440 adapter->ahw.crb_win = -1;
1441 adapter->ahw.ocm_win = -1; 1441 adapter->ahw.ocm_win = -1;
1442 1442
1443 err = netxen_start_firmware(adapter); 1443 err = netxen_start_firmware(adapter);