diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-10-17 10:24:08 -0700 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@osdl.org> | 2006-10-17 10:24:08 -0700 |
| commit | 7c74ac1c236457e454804774e832046c1a7cc0bf (patch) | |
| tree | 10d9bc000ffbec9fc94604977eef69f84a134def /drivers/net/sky2.c | |
| parent | 0edea0f54e1e28bdc1ce6b02d5ca3c4c878cf959 (diff) | |
| download | kernel-crypto-7c74ac1c236457e454804774e832046c1a7cc0bf.tar.gz kernel-crypto-7c74ac1c236457e454804774e832046c1a7cc0bf.tar.xz kernel-crypto-7c74ac1c236457e454804774e832046c1a7cc0bf.zip | |
sky2: use duplex result bits
The result of duplex negotiation is avaliable in the phy status
register, so use that to simplify code and avoid rereading the PHY.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 88b12e85664..6a594b001f5 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -1714,26 +1714,7 @@ static int sky2_autoneg_done(struct sky2_port *sky2, u16 aux) } sky2->speed = sky2_phy_speed(hw, aux); - if (sky2->speed == SPEED_1000) { - u16 ctl2 = gm_phy_read(hw, port, PHY_MARV_1000T_CTRL); - u16 lpa2 = gm_phy_read(hw, port, PHY_MARV_1000T_STAT); - if (lpa2 & PHY_B_1000S_MSF) { - printk(KERN_ERR PFX "%s: master/slave fault", - sky2->netdev->name); - return -1; - } - - if ((ctl2 & PHY_M_1000C_AFD) && (lpa2 & PHY_B_1000S_LP_FD)) - sky2->duplex = DUPLEX_FULL; - else - sky2->duplex = DUPLEX_HALF; - } else { - u16 adv = gm_phy_read(hw, port, PHY_MARV_AUNE_ADV); - if ((aux & adv) & PHY_AN_FULL) - sky2->duplex = DUPLEX_FULL; - else - sky2->duplex = DUPLEX_HALF; - } + sky2->duplex = (aux & PHY_M_PS_FULL_DUP) ? DUPLEX_FULL : DUPLEX_HALF; /* Pause bits are offset (9..8) */ if (hw->chip_id == CHIP_ID_YUKON_XL || hw->chip_id == CHIP_ID_YUKON_EC_U) |