From: Stephen Hemminger <shemminger@osdl.org>
To: "Noah J. Misch" <noah@caltech.edu>
Cc: acme@conectiva.com.br, rddunlap@osdl.org,
linux-kernel@vger.kernel.org, netdev@oss.sgi.com
Subject: Re: [PATCH] Make LLC2 compile with PROC_FS=n
Date: Mon, 20 Oct 2003 10:16:07 -0700 [thread overview]
Message-ID: <20031020101607.76e02647.shemminger@osdl.org> (raw)
In-Reply-To: <Pine.GSO.4.58.0310171452540.13905@blinky>
Why make up a whole separate llc_proc.h file for two prototypes?
Put them on the end of llc.h
diff -Nru a/include/net/llc.h b/include/net/llc.h
--- a/include/net/llc.h Mon Oct 20 10:14:56 2003
+++ b/include/net/llc.h Mon Oct 20 10:14:56 2003
@@ -88,4 +88,12 @@
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 -Nru a/include/net/llc_proc.h b/include/net/llc_proc.h
--- a/include/net/llc_proc.h Mon Oct 20 10:14:56 2003
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -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 -Nru a/net/llc/af_llc.c b/net/llc/af_llc.c
--- a/net/llc/af_llc.c Mon Oct 20 10:14:56 2003
+++ b/net/llc/af_llc.c Mon Oct 20 10:14:56 2003
@@ -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 -Nru a/net/llc/llc_proc.c b/net/llc/llc_proc.c
--- a/net/llc/llc_proc.c Mon Oct 20 10:14:56 2003
+++ b/net/llc/llc_proc.c Mon Oct 20 10:14:56 2003
@@ -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 @@
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 */
next prev parent reply other threads:[~2003-10-20 17:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-10-20 5:03 [PATCH] Make LLC2 compile with PROC_FS=n Noah J. Misch
2003-10-20 7:44 ` Arnaldo Carvalho de Melo
2003-10-20 17:16 ` Stephen Hemminger [this message]
2003-10-21 5:32 ` David S. Miller
2003-10-21 11:13 ` Noah J. Misch
2003-10-22 21:18 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20031020101607.76e02647.shemminger@osdl.org \
--to=shemminger@osdl.org \
--cc=acme@conectiva.com.br \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@oss.sgi.com \
--cc=noah@caltech.edu \
--cc=rddunlap@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).