summaryrefslogtreecommitdiff
path: root/drivers/net/pch_gbe
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-10-13 03:36:19 +0400
committerDavid S. Miller <davem@davemloft.net>2010-10-16 22:13:20 +0400
commit89980827c7a1e3c2b36895c22c6ef0e92aea6b0c (patch)
tree84a248d335452737f66912fe61f8ad5e9ac3a7e7 /drivers/net/pch_gbe
parent35f2516f0a1f9dddb339849c7a07e089322c18c3 (diff)
downloadlinux-89980827c7a1e3c2b36895c22c6ef0e92aea6b0c.tar.xz
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.c3
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");