aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mii.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/mii.c')
-rw-r--r--drivers/net/mii.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/mii.c b/drivers/net/mii.c
index 05acca78f63a..e8198edeaa76 100644
--- a/drivers/net/mii.c
+++ b/drivers/net/mii.c
@@ -157,10 +157,11 @@ int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
157int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd) 157int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
158{ 158{
159 struct net_device *dev = mii->dev; 159 struct net_device *dev = mii->dev;
160 u32 speed = ethtool_cmd_speed(ecmd);
160 161
161 if (ecmd->speed != SPEED_10 && 162 if (speed != SPEED_10 &&
162 ecmd->speed != SPEED_100 && 163 speed != SPEED_100 &&
163 ecmd->speed != SPEED_1000) 164 speed != SPEED_1000)
164 return -EINVAL; 165 return -EINVAL;
165 if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL) 166 if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL)
166 return -EINVAL; 167 return -EINVAL;
@@ -172,7 +173,7 @@ int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
172 return -EINVAL; 173 return -EINVAL;
173 if (ecmd->autoneg != AUTONEG_DISABLE && ecmd->autoneg != AUTONEG_ENABLE) 174 if (ecmd->autoneg != AUTONEG_DISABLE && ecmd->autoneg != AUTONEG_ENABLE)
174 return -EINVAL; 175 return -EINVAL;
175 if ((ecmd->speed == SPEED_1000) && (!mii->supports_gmii)) 176 if ((speed == SPEED_1000) && (!mii->supports_gmii))
176 return -EINVAL; 177 return -EINVAL;
177 178
178 /* ignore supported, maxtxpkt, maxrxpkt */ 179 /* ignore supported, maxtxpkt, maxrxpkt */
@@ -230,9 +231,9 @@ int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
230 bmcr = mii->mdio_read(dev, mii->phy_id, MII_BMCR); 231 bmcr = mii->mdio_read(dev, mii->phy_id, MII_BMCR);
231 tmp = bmcr & ~(BMCR_ANENABLE | BMCR_SPEED100 | 232 tmp = bmcr & ~(BMCR_ANENABLE | BMCR_SPEED100 |
232 BMCR_SPEED1000 | BMCR_FULLDPLX); 233 BMCR_SPEED1000 | BMCR_FULLDPLX);
233 if (ecmd->speed == SPEED_1000) 234 if (speed == SPEED_1000)
234 tmp |= BMCR_SPEED1000; 235 tmp |= BMCR_SPEED1000;
235 else if (ecmd->speed == SPEED_100) 236 else if (speed == SPEED_100)
236 tmp |= BMCR_SPEED100; 237 tmp |= BMCR_SPEED100;
237 if (ecmd->duplex == DUPLEX_FULL) { 238 if (ecmd->duplex == DUPLEX_FULL) {
238 tmp |= BMCR_FULLDPLX; 239 tmp |= BMCR_FULLDPLX;