Return-path: Received: from hu-out-0506.google.com ([72.14.214.234]:32630 "EHLO hu-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759230AbXK2Bnb (ORCPT ); Wed, 28 Nov 2007 20:43:31 -0500 Received: by hu-out-0506.google.com with SMTP id 19so1914723hue for ; Wed, 28 Nov 2007 17:43:28 -0800 (PST) From: "Joonwoo Park" To: "'Zhu Yi'" Cc: , , , References: <00e501c831ab$2e78daa0$9c94fea9@jason> <1196298656.7614.77.camel@debian.sh.intel.com> Subject: RE: [PATCH 1/2] [net/wireless/iwlwifi] : iwlwifi 3945 Fix raceconditional panic. Date: Thu, 29 Nov 2007 10:42:49 +0900 Message-ID: <016401c83229$3302d250$9c94fea9@jason> (sfid-20071129_014421_538106_8BC041E3) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" In-Reply-To: <1196298656.7614.77.camel@debian.sh.intel.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: 2007/11/29, Zhu Yi : > > Good catch. But it will be better if you add it into > iwl_cancel_deferred_work(). > Thanks. I agree with you. Actually, I considered it, but I was afraid of side effect. Anyway, I'm attaching a new one. Thanks. Joonwoo [net/wireless/iwlwifi] : iwlwifi 3945 Fix race conditional panic. Signed-off-by: Joonwoo Park --- diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 465da4f..e51e872 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -8270,6 +8270,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv) { iwl_hw_cancel_deferred_work(priv); + cancel_delayed_work_sync(&priv->init_alive_start); cancel_delayed_work(&priv->scan_check); cancel_delayed_work(&priv->alive_start); cancel_delayed_work(&priv->post_associate); ---