From patchwork Mon Aug 13 15:27:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1313621 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id BEE07DFFFF for ; Mon, 13 Aug 2012 15:29:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753148Ab2HMP2w (ORCPT ); Mon, 13 Aug 2012 11:28:52 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:47803 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753156Ab2HMP2B (ORCPT ); Mon, 13 Aug 2012 11:28:01 -0400 Received: by mail-ee0-f46.google.com with SMTP id l10so1192585eei.19 for ; Mon, 13 Aug 2012 08:28:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=rIUAJzFoV9nkEgGsncI546QDC05syBv4mb68UHGgVrI=; b=QpDBST9hV2NfLMToE8f60lksOapvypiOUYptRPm6biIeDGCQcnc26DGxF+AvHld2Xf 4MD6yTIQmGmwmhPLdWZGbTDWVu6o6jvIpnvdbj6UuuHmCP1xeZ/nnPtYzIAFQJD48N9e 9YvYI8ofYrJOGogHhQvgDhZ8K+zESKV8uvbQJ2UooewAQP+NhPrEgBrU7dawEKJU84rc e/rOQs6HikqPPAfvT1eedhcpYWCIyWCdgjTzMHL/t0W7vb+5bElbsKhdBfMQuKA08iEY YVLV+WhVwFnCkW89+nw19HplFbfSXZltcMKQXG1mtZ0D5hfKaRpwdW7xZ+a4DgX6lma7 9jkA== Received: by 10.14.213.137 with SMTP id a9mr10331714eep.38.1344871680308; Mon, 13 Aug 2012 08:28:00 -0700 (PDT) Received: from localhost (nat-pool-brq-t.redhat.com. [209.132.186.34]) by mx.google.com with ESMTPS id u8sm19844875eel.11.2012.08.13.08.27.59 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Aug 2012 08:27:59 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, faisal.latif@intel.com, roland@kernel.org, sean.hefty@intel.com, hal.rosenstock@gmail.com, fubar@us.ibm.com, andy@greyhouse.net, divy@chelsio.com, jitendra.kalsaria@qlogic.com, sony.chacko@qlogic.com, linux-driver@qlogic.com, kaber@trash.net, ursula.braun@de.ibm.com, blaschka@linux.vnet.ibm.com, linux390@de.ibm.com, shemminger@vyatta.com, bhutchings@solarflare.com, therbert@google.com, xiyou.wangcong@gmail.com, joe@perches.com, gregory.v.rose@intel.com, john.r.fastabend@intel.com, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, bridge@lists.linux-foundation.org, fbl@redhat.com Subject: [patch net-next 15/16] net: remove usage of dev->master Date: Mon, 13 Aug 2012 17:27:14 +0200 Message-Id: <1344871635-1052-16-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1344871635-1052-1-git-send-email-jiri@resnulli.us> References: <1344871635-1052-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQmtxn6DtHyoC8j/RoQ873vH+In2d8P1qUftKIcsd32PMNYHkk43svY0cn/qD/pScDtJIptA Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Signed-off-by: Jiri Pirko --- net/core/dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index c0f9adb..8977404 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5461,8 +5461,8 @@ static void rollback_registered_many(struct list_head *head) if (dev->netdev_ops->ndo_uninit) dev->netdev_ops->ndo_uninit(dev); - /* Notifier chain MUST detach us from master device. */ - WARN_ON(dev->master); + /* Notifier chain MUST detach us all upper devices. */ + WARN_ON(netdev_has_any_upper_dev(dev)); /* Remove entries from kobject tree */ netdev_unregister_kobject(dev);