From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756380Ab0JOPfg (ORCPT ); Fri, 15 Oct 2010 11:35:36 -0400 Received: from hera.kernel.org ([140.211.167.34]:57275 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755350Ab0JOPff (ORCPT ); Fri, 15 Oct 2010 11:35:35 -0400 Message-ID: <4CB874C0.8090003@kernel.org> Date: Fri, 15 Oct 2010 17:35:28 +0200 From: Tejun Heo User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.2.9) Gecko/20100915 Lightning/1.0b2 Thunderbird/3.1.4 MIME-Version: 1.0 To: Johannes Berg , Linux Wireless List , lkml Subject: [PATCH v2.6.36-rc7] mac80211: cancel restart_work explicitly instead of depending on flush_scheduled_work() X-Enigmail-Version: 1.1.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Fri, 15 Oct 2010 15:35:31 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org iee80211_hw->restart_work is the only work which uses the system workqueue. Instead of calling flush_scheduled_work() during iee80211_exit(), cancel the work during unregistration. This is to prepare for the deprecation and removal of flush_scheduled_work(). Signed-off-by: Tejun Heo --- net/mac80211/main.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) Index: work/net/mac80211/main.c =================================================================== --- work.orig/net/mac80211/main.c +++ work/net/mac80211/main.c @@ -606,7 +606,7 @@ int ieee80211_register_hw(struct ieee802 hw->queues = IEEE80211_MAX_QUEUES; local->workqueue = - create_singlethread_workqueue(wiphy_name(local->hw.wiphy)); + alloc_ordered_workqueue(wiphy_name(local->hw.wiphy), 0); if (!local->workqueue) { result = -ENOMEM; goto fail_workqueue; @@ -739,6 +739,7 @@ void ieee80211_unregister_hw(struct ieee del_timer_sync(&local->work_timer); cancel_work_sync(&local->reconfig_filter); + cancel_work_sync(&local->restart_work); ieee80211_clear_tx_pending(local); sta_info_stop(local); @@ -812,12 +813,6 @@ static void __exit ieee80211_exit(void) rc80211_minstrel_ht_exit(); rc80211_minstrel_exit(); - /* - * For key todo, it'll be empty by now but the work - * might still be scheduled. - */ - flush_scheduled_work(); - if (mesh_allocated) ieee80211s_stop();