summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaotian Feng <xtfeng@gmail.com>2012-10-30 22:06:01 +0000
committerDavid S. Miller <davem@davemloft.net>2012-11-03 15:10:14 -0400
commitd145f7ec23b6366e2b75442eaefafa11077ed568 (patch)
treee4e55db0052c66711670fd8c60207adbb06d4000
parent0f89a5733a8d28174c7adeb1fdc20ac11439e766 (diff)
downloadblackbird-op-linux-d145f7ec23b6366e2b75442eaefafa11077ed568.tar.gz
blackbird-op-linux-d145f7ec23b6366e2b75442eaefafa11077ed568.zip
tipc: do not use tasklet_disable before tasklet_kill
If tasklet_disable() is called before related tasklet handled, tasklet_kill will never be finished. tasklet_kill is enough. Signed-off-by: Xiaotian Feng <dannyfeng@tencent.com> Cc: Jon Maloy <jon.maloy@ericsson.com> Cc: Allan Stephens <allan.stephens@windriver.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org Cc: tipc-discussion@lists.sourceforge.net Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tipc/handler.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/tipc/handler.c b/net/tipc/handler.c
index 111ff8300ae5..b36f0fcd9bdf 100644
--- a/net/tipc/handler.c
+++ b/net/tipc/handler.c
@@ -116,7 +116,6 @@ void tipc_handler_stop(void)
return;
handler_enabled = 0;
- tasklet_disable(&tipc_tasklet);
tasklet_kill(&tipc_tasklet);
spin_lock_bh(&qitem_lock);
OpenPOWER on IntegriCloud