From d55dee1fb4a8d180feb1cf0ad4a63d5b63700493 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 12 Oct 2010 23:36:19 +0000 Subject: [PATCH] --- yaml --- r: 215170 b: refs/heads/master c: 89980827c7a1e3c2b36895c22c6ef0e92aea6b0c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/pch_gbe/pch_gbe_ethtool.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ac0dd03aae1c..9eed1799b681 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35f2516f0a1f9dddb339849c7a07e089322c18c3 +refs/heads/master: 89980827c7a1e3c2b36895c22c6ef0e92aea6b0c diff --git a/trunk/drivers/net/pch_gbe/pch_gbe_ethtool.c b/trunk/drivers/net/pch_gbe/pch_gbe_ethtool.c index e06c6aea4527..c8cc32c0edc9 100644 --- a/trunk/drivers/net/pch_gbe/pch_gbe_ethtool.c +++ b/trunk/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");