Skip to contentSkip to conversation

via-velocity: fix reported speed and link detected status

PATCH In review Jay Cliburn 3 participants 3 messages Jul 20, 2006 – Jul 29, 2006

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Jay Cliburn

author
#0 lore raw

PATCH 1/1 via-velocity: fix reported speed and link detected status

The via-velocity driver reports incorrect speed and link detected status as viewed by ethtool (and probably other tools). This patch fixes those incorrect reports and prettifies a long line.

Signed-off-by Jay Cliburn <[email protected]>
drivers/net/via-velocity.c 2006-07-19 18:55:05.000000000 -0500 renamed from drivers/net/via-velocity.c.orig 2006-07-19 18:34:15.000000000 -0500 +13 -4
@@ -2742,7 +2742,7 @@ static u32 check_connection_type(struct 
 
        if (PHYSR0 & PHYSR0_SPDG)
                status |= VELOCITY_SPEED_1000;
-       if (PHYSR0 & PHYSR0_SPD10)
+       else if (PHYSR0 & PHYSR0_SPD10)
                status |= VELOCITY_SPEED_10;
        else
                status |= VELOCITY_SPEED_100;

@@ -2851,8 +2851,17 @@ static int velocity_get_settings(struct 
        u32 status;
        status = check_connection_type(vptr->mac_regs);
 
-       cmd->supported = SUPPORTED_TP | SUPPORTED_Autoneg | SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full;
-       if (status & VELOCITY_SPEED_100)
+       cmd->supported = SUPPORTED_TP |
+                        SUPPORTED_Autoneg |
+                        SUPPORTED_10baseT_Half |
+                        SUPPORTED_10baseT_Full |
+                        SUPPORTED_100baseT_Half |
+                        SUPPORTED_100baseT_Full |
+                        SUPPORTED_1000baseT_Half |
+                        SUPPORTED_1000baseT_Full;
+       if (status & VELOCITY_SPEED_1000)
+               cmd->speed = SPEED_1000;
+       else if (status & VELOCITY_SPEED_100)
                cmd->speed = SPEED_100;
        else
                cmd->speed = SPEED_10;

@@ -2896,7 +2905,7 @@ static u32 velocity_get_link(struct net_
 {
        struct velocity_info *vptr = netdev_priv(dev);
        struct mac_regs __iomem * regs = vptr->mac_regs;
-       return BYTE_REG_BITS_IS_ON(PHYSR0_LINKGD, &regs->PHYSR0)  ? 0 : 1;
+       return BYTE_REG_BITS_IS_ON(PHYSR0_LINKGD, &regs->PHYSR0) ? 1 : 0;
 }
 
 static void velocity_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
#1 lore raw

Jay Cliburn <[email protected]> :

Quoted 3 lines

The via-velocity driver reports incorrect speed and link detected status as viewed by ethtool (and probably other tools). This patch fixes those incorrect reports and prettifies a long line.

Looks fine.

Fixed the whitespace/tabs damage, the 190 cols comment and taged as 'upstream-20060720-00' in branch 'upstream' at
git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6.git

Signature · 1 line
Ueimor
#2 lore raw
Quoted 10 lines · Francois Romieu

Jay Cliburn <[email protected]> :

Quoted 3 lines

The via-velocity driver reports incorrect speed and link detected status as viewed by ethtool (and probably other tools). This patch fixes those incorrect reports and prettifies a long line.

Looks fine.

Fixed the whitespace/tabs damage, the 190 cols comment and taged as 'upstream-20060720-00' in branch 'upstream' at
git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6.git

pulled