diff mbox

linux-next: Tree for April 7 (net/core/dev_addr_lists)

Message ID 1270661889.8141.45.camel@edumazet-laptop
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Eric Dumazet April 7, 2010, 5:38 p.m. UTC
Le mercredi 07 avril 2010 à 09:58 -0700, Randy Dunlap a écrit :
> On Wed, 7 Apr 2010 17:41:23 +1000 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > Changes since 20100401:
> 
> 
> when CONFIG_PROC_FS is disabled:
> 
> linux-next-20100407/net/core/dev_addr_lists.c: In function 'dev_mc_net_init':
> linux-next-20100407/net/core/dev_addr_lists.c:722: error: implicit declaration of function 'proc_net_fops_create'
> linux-next-20100407/net/core/dev_addr_lists.c:722: error: 'dev_mc_seq_fops' undeclared (first use in this function)
> linux-next-20100407/net/core/dev_addr_lists.c:722: error: (Each undeclared identifier is reported only once
> linux-next-20100407/net/core/dev_addr_lists.c:722: error: for each function it appears in.)
> linux-next-20100407/net/core/dev_addr_lists.c: In function 'dev_mc_net_exit':
> linux-next-20100407/net/core/dev_addr_lists.c:729: error: implicit declaration of function 'proc_net_remove'
> make[3]: *** [net/core/dev_addr_lists.o] Error 1
> 
> ---
> ~Randy

Thanks Randy, this should correct this

[PATCH net-next-2.6] net: include linux/proc_fs.h in dev_addr_lists.c

As pointed by Randy Dunlap, we must include linux/proc_fs.h in
net/core/dev_addr_lists.c, regardless of CONFIG_PROC_FS

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>, 
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---


--
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

Comments

Randy Dunlap April 7, 2010, 5:50 p.m. UTC | #1
On Wed, 07 Apr 2010 19:38:09 +0200 Eric Dumazet wrote:

> [PATCH net-next-2.6] net: include linux/proc_fs.h in dev_addr_lists.c
> 
> As pointed by Randy Dunlap, we must include linux/proc_fs.h in
> net/core/dev_addr_lists.c, regardless of CONFIG_PROC_FS
> 
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>, 
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks, Eric.


> ---
> diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c
> index 37d5975..508f9c1 100644
> --- a/net/core/dev_addr_lists.c
> +++ b/net/core/dev_addr_lists.c
> @@ -14,6 +14,7 @@
>  #include <linux/netdevice.h>
>  #include <linux/rtnetlink.h>
>  #include <linux/list.h>
> +#include <linux/proc_fs.h>
>  
>  /*
>   * General list handling functions
> @@ -667,7 +668,6 @@ void dev_mc_init(struct net_device *dev)
>  EXPORT_SYMBOL(dev_mc_init);
>  
>  #ifdef CONFIG_PROC_FS
> -#include <linux/proc_fs.h>
>  #include <linux/seq_file.h>
>  
>  static int dev_mc_seq_show(struct seq_file *seq, void *v)
> 
> 
> --
> 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


---
~Randy
--
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
David Miller April 7, 2010, 11:46 p.m. UTC | #2
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 7 Apr 2010 10:50:49 -0700

> On Wed, 07 Apr 2010 19:38:09 +0200 Eric Dumazet wrote:
> 
>> [PATCH net-next-2.6] net: include linux/proc_fs.h in dev_addr_lists.c
>> 
>> As pointed by Randy Dunlap, we must include linux/proc_fs.h in
>> net/core/dev_addr_lists.c, regardless of CONFIG_PROC_FS
>> 
>> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>, 
>> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> 
> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

Applied, thanks everyone.
--
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 mbox

Patch

diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c
index 37d5975..508f9c1 100644
--- a/net/core/dev_addr_lists.c
+++ b/net/core/dev_addr_lists.c
@@ -14,6 +14,7 @@ 
 #include <linux/netdevice.h>
 #include <linux/rtnetlink.h>
 #include <linux/list.h>
+#include <linux/proc_fs.h>
 
 /*
  * General list handling functions
@@ -667,7 +668,6 @@  void dev_mc_init(struct net_device *dev)
 EXPORT_SYMBOL(dev_mc_init);
 
 #ifdef CONFIG_PROC_FS
-#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
 static int dev_mc_seq_show(struct seq_file *seq, void *v)