From: Stephen Hemminger Date: Fri, 16 Feb 2007 00:40:31 +0000 (-0800) Subject: sky2: no need to reset pause bits on shutdown X-Git-Tag: v2.6.21-rc1~74^2~19 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7a7b5181517752005fd0dc822176a6975218ec0f;p=linux-2.6-omap-h63xx.git sky2: no need to reset pause bits on shutdown Resetting the pause bits on shutdown is not necessary. The code was inherited from the vendor driver, and it is currently #ifdef'd out there as well. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index f2ab3d56e56..e5679965501 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -1742,13 +1742,6 @@ static void sky2_link_down(struct sky2_port *sky2) reg &= ~(GM_GPCR_RX_ENA | GM_GPCR_TX_ENA); gma_write16(hw, port, GM_GP_CTRL, reg); - if (sky2->flow_status == FC_RX) { - /* restore Asymmetric Pause bit */ - gm_phy_write(hw, port, PHY_MARV_AUNE_ADV, - gm_phy_read(hw, port, PHY_MARV_AUNE_ADV) - | PHY_M_AN_ASP); - } - netif_carrier_off(sky2->netdev); netif_stop_queue(sky2->netdev);