aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/stmmac
diff options
context:
space:
mode:
authorPawel Moll <pawel.moll@st.com>2010-08-23 16:40:40 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-25 19:30:50 -0400
commit219dd1132a71875ef7097ac47f634d402478385c (patch)
tree9959713985c6b2f527fc2b71930af262e866eda7 /drivers/net/stmmac
parentc6a056a349d10a6e879ca1be6067873b6feed259 (diff)
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 <pawel.moll@st.com> Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/stmmac')
-rw-r--r--drivers/net/stmmac/stmmac_main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index bbb7951b9c4c..86b6c69c068c 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)
238 case 1000: 238 case 1000:
239 if (likely(priv->is_gmac)) 239 if (likely(priv->is_gmac))
240 ctrl &= ~priv->hw->link.port; 240 ctrl &= ~priv->hw->link.port;
241 if (likely(priv->fix_mac_speed))
242 priv->fix_mac_speed(priv->bsp_priv,
243 phydev->speed);
241 break; 244 break;
242 case 100: 245 case 100:
243 case 10: 246 case 10: