Patchwork [1/9] sky2: turn off pause during shutdown

login
register
mail settings
Submitter stephen hemminger
Date June 17, 2009, 5:30 p.m.
Message ID <20090617173139.536423149@vyatta.com>
Download mbox | patch
Permalink /patch/28798/
State Accepted
Delegated to: David Miller
Headers show

Comments

stephen hemminger - June 17, 2009, 5:30 p.m.
This unblocks the chip if it is stuck in pause cycle during
shutdown.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
David Miller - June 18, 2009, 1:50 a.m.
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 17 Jun 2009 10:30:32 -0700

> This unblocks the chip if it is stuck in pause cycle during
> shutdown.
> 
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/drivers/net/sky2.c	2009-06-17 10:29:17.292748274 -0700
+++ b/drivers/net/sky2.c	2009-06-17 10:29:50.630937431 -0700
@@ -1808,7 +1808,8 @@  static int sky2_down(struct net_device *
 
 	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);