[LLC]: Make LLC2 compile with PROC_FS=n

diff --git a/include/net/llc.h b/include/net/llc.h
index bf3882be3529001da71e9e0968aa510e8aaf5483..c9aed2a8b4e20590d5f882e1150e4c714b8e0afa 100644 (file)
--- a/include/net/llc.h
+++ b/include/net/llc.h
@@ -88,4 +88,12 @@ extern int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,
 
 extern int llc_station_init(void);
 extern void llc_station_exit(void);
+
+#ifdef CONFIG_PROC_FS
+extern int llc_proc_init(void);
+extern void llc_proc_exit(void);
+#else
+#define llc_proc_init()        (0)
+#define llc_proc_exit()        do { } while(0)
+#endif /* CONFIG_PROC_FS */
 #endif /* LLC_H */

diff --git a/include/net/llc_proc.h b/include/net/llc_proc.h
deleted file mode 100644 (file)
index c6e7306..0000000
--- a/include/net/llc_proc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef LLC_PROC_H
-#define LLC_PROC_H
-/*
- * Copyright (c) 1997 by Procom Technology, Inc.
- *              2002 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
- */
-
-extern int llc_proc_init(void);
-extern void llc_proc_exit(void);
-
-#endif /* LLC_PROC_H */

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 693f2a5f457ceb45654634c62b2e9f26f1723e31..a8c13163e19f40f30a0abdba0ef95c360bf539fe 100644 (file)
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -30,7 +30,6 @@
 #include <net/llc_sap.h>
 #include <net/llc_pdu.h>
 #include <net/llc_conn.h>
-#include <net/llc_proc.h>
 
 /* remember: uninitialized global data is zeroed because its in .bss */
 static u16 llc_ui_sap_last_autoport = LLC_SAP_DYN_START;

diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
index 5efc6090e1966671a8793a613dacebaeb4ae999b..84061d5fb00ee1b1a053f13e9916a62a941ee678 100644 (file)
--- a/net/llc/llc_proc.c
+++ b/net/llc/llc_proc.c
@@ -14,7 +14,6 @@
 
 #include <linux/config.h>
 #include <linux/init.h>
-#ifdef CONFIG_PROC_FS
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/errno.h>
@@ -273,13 +272,3 @@ void llc_proc_exit(void)
        remove_proc_entry("core", llc_proc_dir);
        remove_proc_entry("llc", proc_net);
 }
-#else /* CONFIG_PROC_FS */
-int __init llc_proc_init(void)
-{
-       return 0;
-}
-
-void llc_proc_exit(void)
-{
-}
-#endif /* CONFIG_PROC_FS */