Patchwork [2/3] net: dev: fix build failed when procfs is disabled

login
register
mail settings
Submitter Gao feng
Date Feb. 19, 2013, 10:43 a.m.
Message ID <1361270592-19492-2-git-send-email-gaofeng@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/221660/
State Superseded
Delegated to: David Miller
Headers show

Comments

Gao feng - Feb. 19, 2013, 10:43 a.m.
commit 900ff8c6321418dafa03c22e215cb9646a2541b9
"net: move procfs code to net/core/net-procfs.c"
missed define dev_mcast_init when CONFIG_PROC
isn't configured.

Cc: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
---
 include/linux/netdevice.h | 2 ++
 1 file changed, 2 insertions(+)
WANG Cong - Feb. 19, 2013, 12:02 p.m.
On 02/19/2013 06:43 PM, Gao feng wrote:
> commit 900ff8c6321418dafa03c22e215cb9646a2541b9
> "net: move procfs code to net/core/net-procfs.c"
> missed define dev_mcast_init when CONFIG_PROC
> isn't configured.
>
> Cc: Cong Wang <xiyou.wangcong@gmail.com>
> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
> ---
>   include/linux/netdevice.h | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index f111b4f..91f6c7b 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -2693,8 +2693,10 @@ extern void		net_disable_timestamp(void);
>
>   #ifdef CONFIG_PROC_FS
>   extern int __init dev_proc_init(void);
> +extern void __init dev_mcast_init(void);
>   #else
>   #define dev_proc_init() 0
> +#define dev_mcast_init() {}
>   #endif
>
>   extern int netdev_class_create_file(struct class_attribute *class_attr);
>

Thanks for catching this!

I forgot to test !CONFIG_PROC_FS case again after grabbing the mcast piece.

I have a better fix, which moves dev_mcast_init() to dev_proc_init(), 
will post it right now.

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

Patch

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index f111b4f..91f6c7b 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2693,8 +2693,10 @@  extern void		net_disable_timestamp(void);
 
 #ifdef CONFIG_PROC_FS
 extern int __init dev_proc_init(void);
+extern void __init dev_mcast_init(void);
 #else
 #define dev_proc_init() 0
+#define dev_mcast_init() {}
 #endif
 
 extern int netdev_class_create_file(struct class_attribute *class_attr);