From patchwork Fri Dec 14 11:02:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 206389 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A41342C0090 for ; Fri, 14 Dec 2012 22:04:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756229Ab2LNLDF (ORCPT ); Fri, 14 Dec 2012 06:03:05 -0500 Received: from mail-la0-f46.google.com ([209.85.215.46]:36292 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756191Ab2LNLDB (ORCPT ); Fri, 14 Dec 2012 06:03:01 -0500 Received: by mail-la0-f46.google.com with SMTP id p5so2681132lag.19 for ; Fri, 14 Dec 2012 03:03:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=e9gJTdJLMEzbw++cyc2fvSUtYFvp/8Q1rPdCdFrjCCA=; b=lNHrBIkZ1X4czvmSdDbaNsIabeQZpqMuT20Ik+Y+9dD/aB7hVNbFPR1GfUqVbL8WXn /rvIHqjt/g5HvWJ63shEo+HwTBvqSTdXCIWjCQED2HoHRyBvdW6X0ohM1uR83cy0PDD0 OZerfmTHaMXSjkjJnZNi6fNSkAuCx7Be4hLq5qEdpn+uuTWv55M9+IgbyJf2T2WNIJZQ 7ic7b0zJggjYprr4GRX66/lSZossUMuTwZBGpp75VuDn860ZUCNIbnvK6KdQ5PoynK9t 9UT2D51i7fHu1CZZKRS7b38PRCe/dq0vjX2xCTICScyrLAzpE6SJWpyj4+9wHFLtoyh3 edDw== Received: by 10.112.43.161 with SMTP id x1mr2220099lbl.32.1355482980050; Fri, 14 Dec 2012 03:03:00 -0800 (PST) Received: from localhost (swsoft-msk-nat.sw.ru. [195.214.232.10]) by mx.google.com with ESMTPS id p5sm1760571lbh.2.2012.12.14.03.02.58 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Dec 2012 03:02:59 -0800 (PST) Subject: [PATCH 08/12] bonding: do not cancel works in bond_uninit() To: linux-kernel@vger.kernel.org From: Konstantin Khlebnikov Cc: Nikolay Aleksandrov , netdev@vger.kernel.org, Jay Vosburgh , Andy Gospodarek Date: Fri, 14 Dec 2012 15:02:55 +0400 Message-ID: <20121214110255.11019.14759.stgit@zurg> In-Reply-To: <20121214110229.11019.63713.stgit@zurg> References: <20121214110229.11019.63713.stgit@zurg> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Bonding initializes these works in bond_open() and cancels in bond_close(), thus in bond_uninit() they are already canceled but may be unitialized yet. Signed-off-by: Konstantin Khlebnikov Cc: Nikolay Aleksandrov Cc: Jay Vosburgh Cc: Andy Gospodarek Cc: netdev@vger.kernel.org --- drivers/net/bonding/bond_main.c | 2 -- 1 file changed, 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index ef2cb24..b7d45f3 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -4431,8 +4431,6 @@ static void bond_uninit(struct net_device *bond_dev) list_del(&bond->bond_list); - bond_work_cancel_all(bond); - bond_debug_unregister(bond); __hw_addr_flush(&bond->mc_list);