Commit 3d1454dd authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

sky2: revert shutdown changes 



The commit changes to shutdown path broke startup on some systems.

revert commit c0bad0f2

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4dc6dc71

drivers/net/sky2.c

+1 −8
Original line number Diff line number Diff line
@@ -1151,14 +1151,7 @@ static void sky2_rx_stop(struct sky2_port *sky2) 


	/* reset the Rx prefetch unit */

	sky2_write32(hw, Y2_QADDR(rxq, PREF_UNIT_CTRL), PREF_UNIT_RST_SET);



	/* Reset the RAM Buffer receive queue */

	sky2_write8(hw, RB_ADDR(rxq, RB_CTRL), RB_RST_SET);



	/* Reset Rx MAC FIFO */

	sky2_write8(hw, SK_REG(sky2->port, RX_GMF_CTRL_T), GMF_RST_SET);



	sky2_read8(hw, B0_CTST);

	mmiowb();

}



/* Clean out receive buffer area, assumes receiver hardware stopped */