Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a947a39d authored by Mike McCormack's avatar Mike McCormack Committed by David S. Miller
Browse files

sky2: Avoid races in sky2_down 



Reset rx chain before trying to drain it.
Shut interrupts off last, incase there's something to report.

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 86669530

drivers/net/sky2.c

+8 −8
Original line number Diff line number Diff line
@@ -1818,12 +1818,6 @@ static int sky2_down(struct net_device *dev) 
	if (netif_msg_ifdown(sky2))

		printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);



	/* Disable port IRQ */

	imask = sky2_read32(hw, B0_IMSK);

	imask &= ~portirq_msk[port];

	sky2_write32(hw, B0_IMSK, imask);

	sky2_read32(hw, B0_IMSK);



	/* Force flow control off */

	sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
@@ -1863,8 +1857,6 @@ static int sky2_down(struct net_device *dev) 


	sky2_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL), RB_RST_SET);



	sky2_rx_stop(sky2);



	sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);

	sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);
@@ -1874,6 +1866,14 @@ static int sky2_down(struct net_device *dev) 
	sky2_write32(hw, STAT_ISR_TIMER_CNT, 0);

	sky2_read8(hw, STAT_ISR_TIMER_CTRL);



	sky2_rx_stop(sky2);



	/* Disable port IRQ */

	imask = sky2_read32(hw, B0_IMSK);

	imask &= ~portirq_msk[port];

	sky2_write32(hw, B0_IMSK, imask);

	sky2_read32(hw, B0_IMSK);



	synchronize_irq(hw->pdev->irq);

	napi_synchronize(&hw->napi);