From patchwork Wed Jun 10 12:18:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sathya Perla X-Patchwork-Id: 28403 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 39BE7B70AA for ; Wed, 10 Jun 2009 22:19:16 +1000 (EST) Received: by ozlabs.org (Postfix) id 29D7ADDD0B; Wed, 10 Jun 2009 22:19:16 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id BD3AFDDD04 for ; Wed, 10 Jun 2009 22:19:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756391AbZFJMS4 (ORCPT ); Wed, 10 Jun 2009 08:18:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755622AbZFJMS4 (ORCPT ); Wed, 10 Jun 2009 08:18:56 -0400 Received: from segment-124-30.sify.net ([124.30.166.146]:52376 "EHLO sperla-laptop.localdomain" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1755373AbZFJMS4 (ORCPT ); Wed, 10 Jun 2009 08:18:56 -0400 Received: by sperla-laptop.localdomain (Postfix, from userid 1000) id 500BB17E788; Wed, 10 Jun 2009 17:48:35 +0530 (IST) Date: Wed, 10 Jun 2009 17:48:35 +0530 From: Sathya Perla To: netdev Subject: [net-next PATCH 1/5] be2net: Use cancel_delayed_work_sync instead of cancel_delayed_work() Message-ID: <20090610121835.GA16411@serverengines.com> Reply-To: Sathya Perla Mail-Followup-To: netdev MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use cancel_delayed_work_sycn instead of cancel_delayed_work() to reliably kill be_worker() as it rearms itself. Signed-off-by: Sathya Perla --- drivers/net/benet/be_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 347d002..69046a1 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -1533,7 +1533,7 @@ static int be_close(struct net_device *netdev) struct be_eq_obj *tx_eq = &adapter->tx_eq; int vec; - cancel_delayed_work(&adapter->work); + cancel_delayed_work_sync(&adapter->work); netif_stop_queue(netdev); netif_carrier_off(netdev);