diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-18 06:32:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-18 06:32:08 +0200 |
| commit | 4552e1198a08198ce0b42e856845b5394c82c59c (patch) | |
| tree | 1e89b580a7a7f06d3765e50ef4ba642e37b06b4f /drivers/net/netxen/netxen_nic_isr.c | |
| parent | tun: Proper handling of IPv6 header in tun driver when TUN_NO_PI is set (diff) | |
| parent | atl1: relax eeprom mac address error check (diff) | |
| download | linux-4552e1198a08198ce0b42e856845b5394c82c59c.tar.xz linux-4552e1198a08198ce0b42e856845b5394c82c59c.zip | |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/netxen/netxen_nic_isr.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_isr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_isr.c b/drivers/net/netxen/netxen_nic_isr.c index f487615f4063..96cec41f9019 100644 --- a/drivers/net/netxen/netxen_nic_isr.c +++ b/drivers/net/netxen/netxen_nic_isr.c @@ -145,7 +145,7 @@ static void netxen_nic_isr_other(struct netxen_adapter *adapter) /* verify the offset */ val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE)); - val = val >> physical_port[adapter->portnum]; + val = val >> adapter->physical_port; if (val == adapter->ahw.qg_linksup) return; @@ -199,7 +199,7 @@ void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter) /* WINDOW = 1 */ val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE)); - val >>= (physical_port[adapter->portnum] * 8); + val >>= (adapter->physical_port * 8); val &= 0xff; if (adapter->ahw.xg_linkup == 1 && val != XG_LINK_UP) { |