Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 265192
b: refs/heads/master
c: bb24fd6
h: refs/heads/master
v: v3
  • Loading branch information
Joakim Tjernlund authored and David S. Miller committed Aug 8, 2011
1 parent 574cb6d commit aff6b06
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5ae297b0126fe77ab8223f14d2cfcf187f3244c6
refs/heads/master: bb24fd6ab0e948dc5bddec757b9d5a61362fa3f3
10 changes: 6 additions & 4 deletions trunk/drivers/net/ucc_geth.c
Original file line number Diff line number Diff line change
Expand Up @@ -1761,10 +1761,12 @@ static int init_phy(struct net_device *dev)
if (priv->phy_interface == PHY_INTERFACE_MODE_SGMII)
uec_configure_serdes(dev);

phydev->supported &= (ADVERTISED_10baseT_Half |
ADVERTISED_10baseT_Full |
ADVERTISED_100baseT_Half |
ADVERTISED_100baseT_Full);
phydev->supported &= (SUPPORTED_MII |
SUPPORTED_Autoneg |
ADVERTISED_10baseT_Half |
ADVERTISED_10baseT_Full |
ADVERTISED_100baseT_Half |
ADVERTISED_100baseT_Full);

if (priv->max_speed == SPEED_1000)
phydev->supported |= ADVERTISED_1000baseT_Full;
Expand Down

0 comments on commit aff6b06

Please sign in to comment.