From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 1 Sep 2008 11:50:01 +0000 (+0100)
Subject: sfc: Stop generating bogus events in tenxpress_check_hw()
X-Git-Tag: v2.6.28-rc1~717^2~195^2~48
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a620e134e989b7ce683574039fc7cb956aa58970;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index 2ad3d8d12f4..d507c93d666 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);