diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-10-12 23:36:19 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-16 11:13:20 -0700 |
| commit | 89980827c7a1e3c2b36895c22c6ef0e92aea6b0c (patch) | |
| tree | 84a248d335452737f66912fe61f8ad5e9ac3a7e7 /drivers/net/pch_gbe | |
| parent | 35f2516f0a1f9dddb339849c7a07e089322c18c3 (diff) | |
| download | talos-obmc-linux-89980827c7a1e3c2b36895c22c6ef0e92aea6b0c.tar.gz talos-obmc-linux-89980827c7a1e3c2b36895c22c6ef0e92aea6b0c.zip | |
pch_gbe: fix if condition in set_settings()
There were no curly braces in this if condition so it always enabled full
duplex.
And ecmd->speed is an unsigned short so it is never equal to -1. The
effect is that mii_ethtool_sset() fails with -EINVAL and an error is
printed to dmesg.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/pch_gbe')
| -rw-r--r-- | drivers/net/pch_gbe/pch_gbe_ethtool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/pch_gbe/pch_gbe_ethtool.c b/drivers/net/pch_gbe/pch_gbe_ethtool.c index e06c6aea4527..c8cc32c0edc9 100644 --- a/drivers/net/pch_gbe/pch_gbe_ethtool.c +++ b/drivers/net/pch_gbe/pch_gbe_ethtool.c @@ -113,9 +113,10 @@ static int pch_gbe_set_settings(struct net_device *netdev, pch_gbe_hal_write_phy_reg(hw, MII_BMCR, BMCR_RESET); - if (ecmd->speed == -1) + if (ecmd->speed == USHRT_MAX) { ecmd->speed = SPEED_1000; ecmd->duplex = DUPLEX_FULL; + } ret = mii_ethtool_sset(&adapter->mii, ecmd); if (ret) { pr_err("Error: mii_ethtool_sset\n"); |
