diff options
| author | Pawel Moll <pawel.moll@st.com> | 2010-08-23 20:40:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-25 16:30:50 -0700 |
| commit | 219dd1132a71875ef7097ac47f634d402478385c (patch) | |
| tree | 9959713985c6b2f527fc2b71930af262e866eda7 /drivers/net | |
| parent | c6a056a349d10a6e879ca1be6067873b6feed259 (diff) | |
| download | kernel_samsung_aries-219dd1132a71875ef7097ac47f634d402478385c.zip kernel_samsung_aries-219dd1132a71875ef7097ac47f634d402478385c.tar.gz kernel_samsung_aries-219dd1132a71875ef7097ac47f634d402478385c.tar.bz2 | |
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')
| -rw-r--r-- | drivers/net/stmmac/stmmac_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
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: |