From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Wed, 19 Sep 2007 22:36:43 +0000 (-0700)
Subject: sky2: ethtool speed report bug
X-Git-Url: https://git.efficios.com/?a=commitdiff_plain;h=c99210b50fe741026d86fdcb5f3f5a0c00c503cc;p=deliverable%2Flinux.git

sky2: ethtool speed report bug

On 100mbit versions, the driver always reports gigabit speed
available. The correct modes are already computed, then overwritten.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 8b1565453f08..94552cc4c462 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2841,13 +2841,6 @@ static int sky2_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 	ecmd->supported = sky2_supported_modes(hw);
 	ecmd->phy_address = PHY_ADDR_MARV;
 	if (sky2_is_copper(hw)) {
-		ecmd->supported = SUPPORTED_10baseT_Half
-		    | SUPPORTED_10baseT_Full
-		    | SUPPORTED_100baseT_Half
-		    | SUPPORTED_100baseT_Full
-		    | SUPPORTED_1000baseT_Half
-		    | SUPPORTED_1000baseT_Full
-		    | SUPPORTED_Autoneg | SUPPORTED_TP;
 		ecmd->port = PORT_TP;
 		ecmd->speed = sky2->speed;
 	} else {