Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44388c7e authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

sky2: dont change LED after autoneg 



Don't need to change LED's after auto negotiation, the chip
sets them correctly.

Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent af043aa5

drivers/net/sky2.c

+0 −23
Original line number Diff line number Diff line
@@ -1820,29 +1820,6 @@ static void sky2_link_up(struct sky2_port *sky2) 
	sky2_write8(hw, SK_REG(port, LNK_LED_REG),

		    LINKLED_ON | LINKLED_BLINK_OFF | LINKLED_LINKSYNC_OFF);



	if (hw->flags & SKY2_HW_NEWER_PHY) {

		u16 pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR);

		u16 led = PHY_M_LEDC_LOS_CTRL(1);	/* link active */



		switch(sky2->speed) {

		case SPEED_10:

			led |= PHY_M_LEDC_INIT_CTRL(7);

			break;



		case SPEED_100:

			led |= PHY_M_LEDC_STA1_CTRL(7);

			break;



		case SPEED_1000:

			led |= PHY_M_LEDC_STA0_CTRL(7);

			break;

		}



		gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 3);

		gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, led);

		gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);

	}



	if (netif_msg_link(sky2))

		printk(KERN_INFO PFX

		       "%s: Link is up at %d Mbps, %s duplex, flow control %s\n",