diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-07-16 13:20:57 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-16 18:05:37 -0700 |
| commit | 3d1454dd93e84ad1394b6b1646f13795e9f6928e (patch) | |
| tree | 8a4db40e12fd186f389b91b2618e53d75a4d7562 /drivers | |
| parent | 4dc6dc7162c08b9965163c9ab3f9375d4adff2c7 (diff) | |
| download | linux-3.10-3d1454dd93e84ad1394b6b1646f13795e9f6928e.tar.gz linux-3.10-3d1454dd93e84ad1394b6b1646f13795e9f6928e.tar.bz2 linux-3.10-3d1454dd93e84ad1394b6b1646f13795e9f6928e.zip | |
sky2: revert shutdown changes
The commit changes to shutdown path broke startup on some systems.
revert commit c0bad0f2e4366d5bbfe0c4a7a80bca8f4b05272b
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sky2.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index daf961ab68b..ba768dfa59e 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 */ |