X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fnet%2Fbcm63xx_enet.c;h=e94a966af4186bb4db195547ac7ddc7ac957ea1f;hb=14b67c2969ebf50bd5534b2a0c441f8569a9361e;hp=ecfef240a303039390088f59b6425747377f1cdc;hpb=dda5f0a372873bca5f0b1d1866d7784dffd8b675;p=~andy%2Flinux

diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index ecfef240a30..e94a966af41 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -1097,7 +1097,7 @@ static int bcm_enet_stop(struct net_device *dev)
 	enet_dma_writel(priv, 0, ENETDMA_IRMASK_REG(priv->tx_chan));
 
 	/* make sure no mib update is scheduled */
-	flush_scheduled_work();
+	cancel_work_sync(&priv->mib_update_task);
 
 	/* disable dma & mac */
 	bcm_enet_disable_dma(priv, priv->tx_chan);