[PATCH] via-velocity: fix reported speed and link detected status

[Jay Cliburn]

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]>

--- linux-2.6.17.x86_64/drivers/net/via-velocity.c.orig 2006-07-19 
18:34:15.0 -0500
+++ linux-2.6.17.x86_64/drivers/net/via-velocity.c  2006-07-19 
18:55:05.0 -0500
@@ -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, ®s->PHYSR0)  ? 0 : 1;
+   return BYTE_REG_BITS_IS_ON(PHYSR0_LINKGD, ®s->PHYSR0) ? 1 : 0;
 }
 
 static void velocity_get_drvinfo(struct net_device *dev, struct 
ethtool_drvinfo *info)

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] via-velocity: fix reported speed and link detected status

[Francois Romieu]

Jay Cliburn <[EMAIL PROTECTED]> :
> 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

-- 
Ueimor
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] via-velocity: fix reported speed and link detected status

[Jeff Garzik]

Francois Romieu wrote:

Jay Cliburn <[EMAIL PROTECTED]> :

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


-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html