summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/micrel
diff options
context:
space:
mode:
authorXiaotian Feng <xtfeng@gmail.com>2012-10-31 04:29:57 +0400
committerDavid S. Miller <davem@davemloft.net>2012-11-03 23:10:15 +0400
commit175c0dffef310fc7d7f026ca4a7682beb2fbd8ec (patch)
treeb9ff3f9ae6b5a1a6e41b1b950d3820d68c5ef8ac /drivers/net/ethernet/micrel
parentd145f7ec23b6366e2b75442eaefafa11077ed568 (diff)
downloadlinux-175c0dffef310fc7d7f026ca4a7682beb2fbd8ec.tar.xz
drivers/net: use tasklet_kill in device remove/close process
Some driver uses tasklet_disable in device remove/close process, tasklet_disable will inc tasklet->count and return. If the tasklet is not handled yet because some softirq pressure, the tasklet will placed on the tasklet_vec, never have a chance to excute. This might lead to ksoftirqd heavy loaded, wakeup with pending_softirq, but tasklet is disabled. tasklet_kill should be used in this case. Signed-off-by: Xiaotian Feng <dannyfeng@tencent.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/micrel')
-rw-r--r--drivers/net/ethernet/micrel/ksz884x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index 318fee91c79d..e558edd1cb6c 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -5407,8 +5407,8 @@ static int netdev_close(struct net_device *dev)
/* Delay for receive task to stop scheduling itself. */
msleep(2000 / HZ);
- tasklet_disable(&hw_priv->rx_tasklet);
- tasklet_disable(&hw_priv->tx_tasklet);
+ tasklet_kill(&hw_priv->rx_tasklet);
+ tasklet_kill(&hw_priv->tx_tasklet);
free_irq(dev->irq, hw_priv->dev);
transmit_cleanup(hw_priv, 0);