Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753560Ab2HMRPl (ORCPT ); Mon, 13 Aug 2012 13:15:41 -0400 Received: from webmail.solarflare.com ([12.187.104.25]:51920 "EHLO ocex02.SolarFlarecom.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752204Ab2HMRPi (ORCPT ); Mon, 13 Aug 2012 13:15:38 -0400 Message-ID: <1344878131.2733.28.camel@bwh-desktop.uk.solarflarecom.com> Subject: Re: [patch net-next 15/16] net: remove usage of dev->master From: Ben Hutchings To: Jiri Pirko CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Mon, 13 Aug 2012 18:15:31 +0100 In-Reply-To: <1344871635-1052-16-git-send-email-jiri@resnulli.us> References: <1344871635-1052-1-git-send-email-jiri@resnulli.us> <1344871635-1052-16-git-send-email-jiri@resnulli.us> Organization: Solarflare Communications Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3 (3.2.3-3.fc16) Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-Originating-IP: [10.17.20.137] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1330 Lines: 37 On Mon, 2012-08-13 at 17:27 +0200, Jiri Pirko wrote: > 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); I think this should be folded into patch 1, since that already ensures that any master device is included in the upper device list. Ben. -- Ben Hutchings, Staff Engineer, Solarflare Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked. -- 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/