From 30c1c65e6e02a83c167e3d32119f4ef2fd4981d5 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 17 Oct 2006 10:24:08 -0700 Subject: [PATCH] --- yaml --- r: 39775 b: refs/heads/master c: 7c74ac1c236457e454804774e832046c1a7cc0bf h: refs/heads/master i: 39773: dba802624af42b443855c3b9f70a926809de5c78 39771: 679440685ccf4bf530650a86f158bdfd308e9b26 39767: 36297bc9dee30076e8ffd0b74b84078607dc8b7f 39759: 56b471c3d8a0f6d6a3a460e9551de85747f8f71b 39743: 7224036fd733c6b1d2d01295e7d15635cbe168c8 v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/[refs] b/[refs] index 62d6695599bd..6408dc2ed139 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0edea0f54e1e28bdc1ce6b02d5ca3c4c878cf959 +refs/heads/master: 7c74ac1c236457e454804774e832046c1a7cc0bf diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 88b12e856649..6a594b001f58 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/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)