aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2008-09-01 12:50:01 +0100
committerJeff Garzik <jgarzik@redhat.com>2008-09-24 18:54:39 -0400
commita620e134e989b7ce683574039fc7cb956aa58970 (patch)
tree49e1d74b34140cce7725c74e7ceefd963e177bc9
parent94be0c5424b7871e0411b71c12c28b2fd8e8564c (diff)
downloadkernel_samsung_crespo-a620e134e989b7ce683574039fc7cb956aa58970.zip
kernel_samsung_crespo-a620e134e989b7ce683574039fc7cb956aa58970.tar.gz
kernel_samsung_crespo-a620e134e989b7ce683574039fc7cb956aa58970.tar.bz2
sfc: Stop generating bogus events in tenxpress_check_hw()
mdio_clause45_links_ok() correctly checks efx_phy_mode_disabled(), so tenxpress_link_ok() doesn't need to. From: Steve Hodgson <shodgson@solarflare.com> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r--drivers/net/sfc/tenxpress.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index 2ad3d8d..d507c93 100644
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
@@ -377,8 +377,7 @@ static int tenxpress_phy_check_hw(struct efx_nic *efx)
struct tenxpress_phy_data *phy_data = efx->phy_data;
bool link_ok;
- link_ok = (phy_data->phy_mode == PHY_MODE_NORMAL &&
- tenxpress_link_ok(efx, true));
+ link_ok = tenxpress_link_ok(efx, true);
if (link_ok != efx->link_up)
falcon_xmac_sim_phy_event(efx);