netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [2.6 patch] net/atm/clip.c: fix PROC_FS=n compile
@ 2006-07-08 20:20 Adrian Bunk
  2006-07-09 19:13 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2006-07-08 20:20 UTC (permalink / raw)
  To: Stephen Hemminger; +Cc: davem, netdev, linux-kernel, chas, linux-atm-general

This patch fixes the following compile error with CONFIG_PROC_FS=n by 
reverting commit dcdb02752ff13a64433c36f2937a58d93ae7a19e:

<--  snip  -->

...
  CC      net/atm/clip.o
net/atm/clip.c: In function ‘atm_clip_init’:
net/atm/clip.c:975: error: ‘atm_proc_root’ undeclared (first use in this function)
net/atm/clip.c:975: error: (Each undeclared identifier is reported only once
net/atm/clip.c:975: error: for each function it appears in.)
net/atm/clip.c:977: error: ‘arp_seq_fops’ undeclared (first use in this function)
make[2]: *** [net/atm/clip.o] Error 1

<--  snip  -->

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 net/atm/clip.c |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

--- linux-2.6.17-mm6-full/net/atm/clip.c.old	2006-07-08 13:58:07.000000000 +0200
+++ linux-2.6.17-mm6-full/net/atm/clip.c	2006-07-08 13:55:48.000000000 +0200
@@ -962,7 +962,6 @@
 
 static int __init atm_clip_init(void)
 {
-	struct proc_dir_entry *p;
 	neigh_table_init_no_netlink(&clip_tbl);
 
 	clip_tbl_hook = &clip_tbl;
@@ -972,9 +971,15 @@
 
 	setup_timer(&idle_timer, idle_timer_check, 0);
 
-	p = create_proc_entry("arp", S_IRUGO, atm_proc_root);
-	if (p)
-		p->proc_fops = &arp_seq_fops;
+#ifdef CONFIG_PROC_FS
+	{
+		struct proc_dir_entry *p;
+
+		p = create_proc_entry("arp", S_IRUGO, atm_proc_root);
+		if (p)
+			p->proc_fops = &arp_seq_fops;
+	}
+#endif
 
 	return 0;
 }


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

end of thread, other threads:[~2006-07-09 19:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-08 20:20 [2.6 patch] net/atm/clip.c: fix PROC_FS=n compile Adrian Bunk
2006-07-09 19:13 ` 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).