Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754387Ab0LOO3J (ORCPT ); Wed, 15 Dec 2010 09:29:09 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:55710 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754066Ab0LOO3I (ORCPT ); Wed, 15 Dec 2010 09:29:08 -0500 Date: Wed, 15 Dec 2010 08:29:00 -0600 From: Jon Mason To: Tejun Heo Cc: "David S. Miller" , "netdev@vger.kernel.org" , lkml Subject: Re: [PATCH net-next-2.6] vxge: add missing flush of reset_task Message-ID: <20101215142859.GA13516@exar.com> References: <4D08CAB1.6040402@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4D08CAB1.6040402@kernel.org> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1225 Lines: 33 On Wed, Dec 15, 2010 at 06:03:29AM -0800, Tejun Heo wrote: > Commit 6e07ebd84 (drivers/net: remove unnecessary > flush_scheduled_work() calls) incorrectly removed the flush call > without replacing it with the appropriate work specific operation. > Fix it by flushing vdev->reset_task explicitly. > > Pointed out by Jon Mason. > > Signed-off-by: Tejun Heo > Cc: Jon Mason Acked-by: Jon Mason > --- > drivers/net/vxge/vxge-main.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c > index 537ad87..1ac9b56 100644 > --- a/drivers/net/vxge/vxge-main.c > +++ b/drivers/net/vxge/vxge-main.c > @@ -3439,6 +3439,8 @@ static void vxge_device_unregister(struct __vxge_hw_device *hldev) > > strncpy(buf, dev->name, IFNAMSIZ); > > + flush_work_sync(&vdev->reset_task); > + > /* in 2.6 will call stop() if device is up */ > unregister_netdev(dev); > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/