From: Pawel Moll Date: Mon, 23 Aug 2010 20:40:40 +0000 (+0000) Subject: stmmac: fix_mac_speed is called during 10/100<->1000 speed changes X-Git-Tag: upstream/snapshot3+hdmi~12689^2~672 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=219dd1132a71875ef7097ac47f634d402478385c;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git stmmac: fix_mac_speed is called during 10/100<->1000 speed changes This patch modifies the stmmac_adjust_link() function so the fix_mac_speed() is called not only when link speed is changing between 10 and 100 Mbps (as required in RMII mode) but also for 1000 Mbps. Signed-off-by: Pawel Moll Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller --- diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index bbb7951..86b6c69 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c @@ -238,6 +238,9 @@ static void stmmac_adjust_link(struct net_device *dev) case 1000: if (likely(priv->is_gmac)) ctrl &= ~priv->hw->link.port; + if (likely(priv->fix_mac_speed)) + priv->fix_mac_speed(priv->bsp_priv, + phydev->speed); break; case 100: case 10: