* [PATCH] via-velocity: fix reported speed and link detected status
@ 2006-07-20 3:28 Jay Cliburn
2006-07-20 21:57 ` Francois Romieu
0 siblings, 1 reply; 3+ messages in thread
From: Jay Cliburn @ 2006-07-20 3:28 UTC (permalink / raw)
To: netdev; +Cc: jgarzik
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 <jacliburn@bellsouth.net>
--- linux-2.6.17.x86_64/drivers/net/via-velocity.c.orig 2006-07-19 18:34:15.000000000 -0500
+++ linux-2.6.17.x86_64/drivers/net/via-velocity.c 2006-07-19 18:55:05.000000000 -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)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] via-velocity: fix reported speed and link detected status
2006-07-20 3:28 [PATCH] via-velocity: fix reported speed and link detected status Jay Cliburn
@ 2006-07-20 21:57 ` Francois Romieu
2006-07-29 5:26 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Francois Romieu @ 2006-07-20 21:57 UTC (permalink / raw)
To: Jay Cliburn; +Cc: netdev, jgarzik
Jay Cliburn <jacliburn@bellsouth.net> :
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] via-velocity: fix reported speed and link detected status
2006-07-20 21:57 ` Francois Romieu
@ 2006-07-29 5:26 ` Jeff Garzik
0 siblings, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2006-07-29 5:26 UTC (permalink / raw)
To: Francois Romieu; +Cc: Jay Cliburn, netdev
Francois Romieu wrote:
> Jay Cliburn <jacliburn@bellsouth.net> :
>> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-07-29 5:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-20 3:28 [PATCH] via-velocity: fix reported speed and link detected status Jay Cliburn
2006-07-20 21:57 ` Francois Romieu
2006-07-29 5:26 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).