git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'bkl-removal', 'cma', 'ehca', 'for-2.6.27', 'mlx4', 'mthca' and 'nes...
[pandora-kernel.git]
/
drivers
/
net
/
netxen
/
netxen_nic_isr.c
diff --git
a/drivers/net/netxen/netxen_nic_isr.c
b/drivers/net/netxen/netxen_nic_isr.c
index
f487615
..
96cec41
100644
(file)
--- 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));
/* 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;
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));
/* 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) {
val &= 0xff;
if (adapter->ahw.xg_linkup == 1 && val != XG_LINK_UP) {