[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1344878131.2733.28.camel@bwh-desktop.uk.solarflarecom.com>
Date: Mon, 13 Aug 2012 18:15:31 +0100
From: Ben Hutchings <bhutchings@...arflare.com>
To: Jiri Pirko <jiri@...nulli.us>
CC: <netdev@...r.kernel.org>, <davem@...emloft.net>,
<edumazet@...gle.com>, <faisal.latif@...el.com>,
<roland@...nel.org>, <sean.hefty@...el.com>,
<hal.rosenstock@...il.com>, <fubar@...ibm.com>,
<andy@...yhouse.net>, <divy@...lsio.com>,
<jitendra.kalsaria@...gic.com>, <sony.chacko@...gic.com>,
<linux-driver@...gic.com>, <kaber@...sh.net>,
<ursula.braun@...ibm.com>, <blaschka@...ux.vnet.ibm.com>,
<linux390@...ibm.com>, <shemminger@...tta.com>,
<therbert@...gle.com>, <xiyou.wangcong@...il.com>,
<joe@...ches.com>, <gregory.v.rose@...el.com>,
<john.r.fastabend@...el.com>, <linux-rdma@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <linux-s390@...r.kernel.org>,
<bridge@...ts.linux-foundation.org>, <fbl@...hat.com>
Subject: Re: [patch net-next 15/16] net: remove usage of dev->master
On Mon, 2012-08-13 at 17:27 +0200, Jiri Pirko wrote:
> Signed-off-by: Jiri Pirko <jiri@...nulli.us>
> ---
> 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists