---

yaml --- r: 135051 b: refs/heads/master c: ca83db3 h: refs/heads/master i: 135049: c4d43ee 135047: 0f0bb1c v: v3
git-mirror · Mar 5, 2009 · 238f2d9 · 238f2d9
1 parent 83a70dc
commit 238f2d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c5c2d3089068d4aa378f7a40d2b5ad9d4f52ce8
+refs/heads/master: ca83db369c1c633142c08dd0bfafca6ac4247c63
diff --git a/trunk/drivers/net/sfc/ethtool.c b/trunk/drivers/net/sfc/ethtool.c
@@ -529,7 +529,14 @@ static int efx_ethtool_nway_reset(struct net_device *net_dev)
 {
 	struct efx_nic *efx = netdev_priv(net_dev);
 
-	return mii_nway_restart(&efx->mii);
+	if (efx->phy_op->mmds & DEV_PRESENT_BIT(MDIO_MMD_AN)) {
+		mdio_clause45_set_flag(efx, efx->mii.phy_id, MDIO_MMD_AN,
+				       MDIO_MMDREG_CTRL1,
+				       __ffs(BMCR_ANRESTART), true);
+		return 0;
+	}
+
+	return -EOPNOTSUPP;
 }
 
 static u32 efx_ethtool_get_link(struct net_device *net_dev)