]> err.no Git - linux-2.6/commitdiff
sky2: ethtool speed report bug
authorStephen Hemminger <shemminger@linux-foundation.org>
Wed, 19 Sep 2007 22:36:43 +0000 (15:36 -0700)
committerJeff Garzik <jeff@garzik.org>
Thu, 20 Sep 2007 19:23:00 +0000 (15:23 -0400)
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>
drivers/net/sky2.c

index 8b1565453f087b1ca24c4fd42d947200268eba22..94552cc4c462327974ca2d2f017a70e0c9c1b440 100644 (file)
@@ -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 {