netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next] net/ipv4: Fix missing raw_init when CONFIG_PROC_FS is disabled
@ 2018-11-28  4:52 David Ahern
  2018-11-28  4:58 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: David Ahern @ 2018-11-28  4:52 UTC (permalink / raw)
  To: netdev; +Cc: mmanning, rdunlap, David Ahern

From: David Ahern <dsahern@gmail.com>

Randy reported when CONFIG_PROC_FS is not enabled:
    ld: net/ipv4/af_inet.o: in function `inet_init':
    af_inet.c:(.init.text+0x42d): undefined reference to `raw_init'

Fix by moving the endif up to the end of the proc entries

Fixes: 6897445fb194c ("net: provide a sysctl raw_l3mdev_accept for raw socket lookup with VRFs")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Mike Manning <mmanning@vyatta.att-mail.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
---
 net/ipv4/raw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index fb1f02015a15..076f51646d26 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -1132,6 +1132,7 @@ void __init raw_proc_exit(void)
 {
 	unregister_pernet_subsys(&raw_net_ops);
 }
+#endif /* CONFIG_PROC_FS */
 
 static void raw_sysctl_init_net(struct net *net)
 {
@@ -1156,4 +1157,3 @@ void __init raw_init(void)
 	if (register_pernet_subsys(&raw_sysctl_ops))
 		panic("RAW: failed to init sysctl parameters.\n");
 }
-#endif /* CONFIG_PROC_FS */
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH net-next] net/ipv4: Fix missing raw_init when CONFIG_PROC_FS is disabled
  2018-11-28  4:52 [PATCH net-next] net/ipv4: Fix missing raw_init when CONFIG_PROC_FS is disabled David Ahern
@ 2018-11-28  4:58 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2018-11-28  4:58 UTC (permalink / raw)
  To: dsahern; +Cc: netdev, mmanning, rdunlap, dsahern

From: David Ahern <dsahern@kernel.org>
Date: Tue, 27 Nov 2018 20:52:24 -0800

> From: David Ahern <dsahern@gmail.com>
> 
> Randy reported when CONFIG_PROC_FS is not enabled:
>     ld: net/ipv4/af_inet.o: in function `inet_init':
>     af_inet.c:(.init.text+0x42d): undefined reference to `raw_init'
> 
> Fix by moving the endif up to the end of the proc entries
> 
> Fixes: 6897445fb194c ("net: provide a sysctl raw_l3mdev_accept for raw socket lookup with VRFs")
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Mike Manning <mmanning@vyatta.att-mail.com>
> Signed-off-by: David Ahern <dsahern@gmail.com>

Applied.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-11-28 16:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-28  4:52 [PATCH net-next] net/ipv4: Fix missing raw_init when CONFIG_PROC_FS is disabled David Ahern
2018-11-28  4:58 ` David Miller

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