From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 17 Jun 2009 07:30:32 +0000 (+0000)
Subject: sky2: turn off pause during shutdown
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d104acaf0540aee527d22eafd14b0a3d30be7f81;p=linux.git

sky2: turn off pause during shutdown

This unblocks the chip if it is stuck in pause cycle during
shutdown.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index c6ceba95ace76..5de2a9063b2b7 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1808,7 +1808,8 @@ static int sky2_down(struct net_device *dev)
 
 	synchronize_irq(hw->pdev->irq);
 
-	sky2_gmac_reset(hw, port);
+	/* Force flow control off */
+	sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
 
 	/* Stop transmitter */
 	sky2_write32(hw, Q_ADDR(txqaddr[port], Q_CSR), BMU_STOP);