diff options
| author | Sucheta Chakraborty <sucheta.chakraborty@qlogic.com> | 2010-01-02 03:25:19 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-03 22:06:16 -0800 |
| commit | a4b751d87241c1b49ce43f819428223bfc22dc27 (patch) | |
| tree | 53c92cf7799c68a8cb810aa3c4803a910f3da7e8 /drivers/net/netxen/netxen_nic_main.c | |
| parent | 2d2cf34681e65a2495946ebc90b407ba4088e8d0 (diff) | |
| download | linux-a4b751d87241c1b49ce43f819428223bfc22dc27.tar.bz2 | |
netxen: fix ethtool link test
o Fix ethtool link test for NX3031 chip.
o Remove unused code from phy interrupt callback
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.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.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 6cae26a5bd67..880fcd0663e6 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -1898,12 +1898,8 @@ static void netxen_nic_handle_phy_intr(struct netxen_adapter *adapter) linkup = (val == XG_LINK_UP_P3); } else { val = NXRD32(adapter, CRB_XG_STATE); - if (adapter->ahw.port_type == NETXEN_NIC_GBE) - linkup = (val >> port) & 1; - else { - val = (val >> port*8) & 0xff; - linkup = (val == XG_LINK_UP); - } + val = (val >> port*8) & 0xff; + linkup = (val == XG_LINK_UP); } netxen_advert_link_change(adapter, linkup); |