From 6bacb14dd2ddcd0a86d7f8d4e49792a55b6bc333 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 16 Jul 2009 13:20:57 +0000 Subject: [PATCH] sky2: revert shutdown changes The commit changes to shutdown path broke startup on some systems. revert commit e2033779443643e7b2fc3d9035639f64cd040e22 Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller --- drivers/net/sky2.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index daf961ab68bc2..ba768dfa59e05 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -1151,14 +1151,7 @@ stopped: /* 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 */ -- 2.39.5