From: Eric Dumazet <eric.dumazet@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Tom Herbert <therbert@google.com>
Subject: Re: linux-next: build failure after merge of the final tree (net tree related)
Date: Mon, 29 Mar 2010 08:59:30 +0200 [thread overview]
Message-ID: <1269845970.2164.4.camel@edumazet-laptop> (raw)
In-Reply-To: <1269845561.2164.1.camel@edumazet-laptop>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Le lundi 29 mars 2010 à 08:52 +0200, Eric Dumazet a écrit :
> Le lundi 29 mars 2010 à 17:43 +1100, Stephen Rothwell a écrit :
> > Hi Dave,
> >
> > After merging the final tree, today's linux-next build (powerpc
> > ppc44x_defconfig) failed like this:
> >
> > net/core/net-sysfs.c:476: warning: 'struct netdev_rx_queue' declared inside parameter list
> > net/core/net-sysfs.c:476: warning: its scope is only this definition or declaration, which is probably not what you want
> > net/core/net-sysfs.c:478: warning: 'struct netdev_rx_queue' declared inside parameter list
> > net/core/net-sysfs.c: In function 'rx_queue_attr_show':
> > net/core/net-sysfs.c:489: error: dereferencing pointer to incomplete type
> > net/core/net-sysfs.c:489: warning: type defaults to 'int' in declaration of '__mptr'
> > net/core/net-sysfs.c:489: warning: initialization from incompatible pointer type
> > net/core/net-sysfs.c:489: error: invalid use of undefined type 'struct netdev_rx_queue'
> > net/core/net-sysfs.c:494: warning: passing argument 1 of 'attribute->show' from incompatible pointer type
> > net/core/net-sysfs.c:494: note: expected 'struct netdev_rx_queue *' but argument is of type 'struct netdev_rx_queue *'
> >
> > (and many more)
> >
> > Caused by commit 0a9627f2649a02bea165cfd529d7bcb625c2fcad ("rps: Receive
> > Packet Steering") from the net tree. struct netdev_rx_queue is protected by
> > CONFIG_RPS in netdevice.h, but uses are not so protected in net-sysfs.c.
> >
> > I applied the following patch for today:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 29 Mar 2010 17:27:55 +1100
> > Subject: [PATCH] rps: fix net-sysfs build for !CONFIG_RPS
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Oops, a cleaner patch would be :
[PATCH] rps: fix net-sysfs build for !CONFIG_RPS
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index f6b6bfe..2144a7f 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -466,6 +466,7 @@ static struct attribute_group wireless_group = {
};
#endif
+#ifdef CONFIG_RPS
/*
* RX queue sysfs structures and functions.
*/
@@ -675,7 +676,7 @@ static void rx_queue_remove_kobjects(struct net_device *net)
kobject_put(&net->_rx[i].kobj);
kset_unregister(net->queues_kset);
}
-
+#endif /* CONFIG_RPS */
#endif /* CONFIG_SYSFS */
#ifdef CONFIG_HOTPLUG
@@ -739,7 +740,7 @@ void netdev_unregister_kobject(struct net_device * net)
if (!net_eq(dev_net(net), &init_net))
return;
-#ifdef CONFIG_SYSFS
+#ifdef CONFIG_RPS
rx_queue_remove_kobjects(net);
#endif
@@ -782,7 +783,7 @@ int netdev_register_kobject(struct net_device *net)
if (error)
return error;
-#ifdef CONFIG_SYSFS
+#ifdef CONFIG_RPS
error = rx_queue_register_kobjects(net);
if (error) {
device_del(dev);
next prev parent reply other threads:[~2010-03-29 6:59 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-29 6:43 linux-next: build failure after merge of the final tree (net tree related) Stephen Rothwell
2010-03-29 6:52 ` Eric Dumazet
2010-03-29 6:59 ` Eric Dumazet [this message]
2010-03-29 8:01 ` David Miller
2010-03-29 8:04 ` Stephen Rothwell
2010-03-29 7:01 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-01-09 5:38 Stephen Rothwell
2012-01-09 6:52 ` David Miller
2012-01-16 7:36 ` Glauber Costa
2011-12-22 6:07 Stephen Rothwell
2011-12-22 6:16 ` Eric Dumazet
2011-12-22 7:01 ` David Miller
2011-11-02 5:37 Stephen Rothwell
2011-11-02 5:50 ` David Miller
2011-08-15 5:20 Stephen Rothwell
2011-08-15 5:56 ` David Miller
2011-08-16 5:28 ` Stephen Rothwell
2011-08-16 6:11 ` David Miller
2011-08-16 6:57 ` Stephen Rothwell
2011-08-16 7:17 ` David Miller
2011-06-23 5:29 Stephen Rothwell
2011-06-23 13:04 ` Alexey Dobriyan
2011-06-27 5:29 ` Stephen Rothwell
2011-06-29 6:09 ` Stephen Rothwell
2011-06-29 9:58 ` David Miller
2011-06-23 5:25 Stephen Rothwell
2011-06-27 5:35 ` Stephen Rothwell
2011-06-29 6:01 ` Stephen Rothwell
2011-06-29 9:56 ` David Miller
2011-06-08 5:54 Stephen Rothwell
2011-06-08 7:16 ` David Miller
2011-04-21 22:10 Stephen Rothwell
2011-04-21 22:19 ` David Miller
2011-02-03 4:13 Stephen Rothwell
2011-02-03 4:46 ` David Miller
2011-02-03 5:14 ` Stephen Rothwell
2010-11-15 0:46 Stephen Rothwell
2010-11-15 16:52 ` David Miller
2010-11-15 16:58 ` Eric Dumazet
2010-10-18 7:36 Stephen Rothwell
2010-10-18 8:06 ` David Miller
2010-09-27 5:44 Stephen Rothwell
2010-09-27 8:17 ` David Miller
2010-09-27 15:55 ` Ohad Ben-Cohen
2010-09-27 18:04 ` John W. Linville
2010-09-27 18:18 ` David Miller
2010-09-27 18:25 ` John W. Linville
2010-09-27 18:38 ` Ohad Ben-Cohen
2010-09-27 18:44 ` John W. Linville
2010-09-27 19:01 ` Ohad Ben-Cohen
2010-09-27 19:06 ` Ohad Ben-Cohen
2010-09-27 19:44 ` John W. Linville
2010-09-27 20:18 ` Ohad Ben-Cohen
2010-09-03 1:47 Stephen Rothwell
2010-09-03 1:52 ` Stephen Rothwell
2010-09-03 2:16 ` David Miller
2010-09-03 2:14 ` David Miller
2010-08-31 3:18 Stephen Rothwell
2010-08-31 4:43 ` David Miller
2010-08-30 3:04 Stephen Rothwell
2010-08-30 3:29 ` Simon Horman
2010-08-30 4:23 ` David Miller
2010-08-25 2:09 Stephen Rothwell
2010-08-25 4:22 ` Rasesh Mody
2010-08-25 7:35 ` David Miller
2010-08-25 20:59 ` David Miller
2010-08-25 21:53 ` Rasesh Mody
2010-08-26 1:05 ` Stephen Rothwell
2010-08-23 3:27 Stephen Rothwell
2010-08-23 3:31 ` David Miller
2010-07-29 4:13 Stephen Rothwell
2010-07-29 5:21 ` David Miller
2010-04-27 5:25 Stephen Rothwell
2010-04-27 16:34 ` David Miller
2010-04-27 17:18 ` David Miller
2010-04-28 1:11 ` Stephen Rothwell
2010-03-18 4:23 Stephen Rothwell
2010-03-18 6:23 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1269845970.2164.4.camel@edumazet-laptop \
--to=eric.dumazet@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=therbert@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).