Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream-fixes
+13
-4
+13
-4
drivers/net/via-velocity.c
+13
-4
drivers/net/via-velocity.c
···
2742
2742
2743
2743
if (PHYSR0 & PHYSR0_SPDG)
2744
2744
status |= VELOCITY_SPEED_1000;
2745
-
if (PHYSR0 & PHYSR0_SPD10)
2745
+
else if (PHYSR0 & PHYSR0_SPD10)
2746
2746
status |= VELOCITY_SPEED_10;
2747
2747
else
2748
2748
status |= VELOCITY_SPEED_100;
···
2851
2851
u32 status;
2852
2852
status = check_connection_type(vptr->mac_regs);
2853
2853
2854
-
cmd->supported = SUPPORTED_TP | SUPPORTED_Autoneg | SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full;
2855
-
if (status & VELOCITY_SPEED_100)
2854
+
cmd->supported = SUPPORTED_TP |
2855
+
SUPPORTED_Autoneg |
2856
+
SUPPORTED_10baseT_Half |
2857
+
SUPPORTED_10baseT_Full |
2858
+
SUPPORTED_100baseT_Half |
2859
+
SUPPORTED_100baseT_Full |
2860
+
SUPPORTED_1000baseT_Half |
2861
+
SUPPORTED_1000baseT_Full;
2862
+
if (status & VELOCITY_SPEED_1000)
2863
+
cmd->speed = SPEED_1000;
2864
+
else if (status & VELOCITY_SPEED_100)
2856
2865
cmd->speed = SPEED_100;
2857
2866
else
2858
2867
cmd->speed = SPEED_10;
···
2905
2896
{
2906
2897
struct velocity_info *vptr = netdev_priv(dev);
2907
2898
struct mac_regs __iomem * regs = vptr->mac_regs;
2908
-
return BYTE_REG_BITS_IS_ON(PHYSR0_LINKGD, ®s->PHYSR0) ? 0 : 1;
2899
+
return BYTE_REG_BITS_IS_ON(PHYSR0_LINKGD, ®s->PHYSR0) ? 1 : 0;
2909
2900
}
2910
2901
2911
2902
static void velocity_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)