[Patch 2.6] Net - Exclude uneeded code when ! CONFIG_PROC_FS

[Michal Rokos]

Hello,

just tiny fixes for ! CONFIG_PROC_FS configuration.

It removes few "unused code" warnings.

Tested by compilation only. (With CONFIG_PROC_FS on and off)

Michal

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/10/15 13:26:25+02:00 michal@xxxxxxxxxxxxxx 
#   Fixes for ifdef code wrapping for ! CONFIG_PROC_FS setup.
# 
# net/irda/ircomm/ircomm_tty.c
#   2004/10/15 13:26:12+02:00 michal@xxxxxxxxxxxxxx +1 -1
#   Move ifdef more on top, so no /proc related code is compiled when ! 
CONFIG_PROC_FS.
# 
# net/ipv6/tcp_ipv6.c
#   2004/10/15 13:26:11+02:00 michal@xxxxxxxxxxxxxx +1 -1
#   Move ifdef more on top, so no /proc related code is compiled when ! 
CONFIG_PROC_FS.
# 
# net/ipv6/route.c
#   2004/10/15 13:26:11+02:00 michal@xxxxxxxxxxxxxx +2 -0
#   Fix 1 missing bit for ! CONFIG_PROC_FS setup.
# 
# net/ipv6/netfilter/ip6_queue.c
#   2004/10/15 13:26:11+02:00 michal@xxxxxxxxxxxxxx +2 -0
#   Exclude /proc related code when ! CONFIG_PROC_FS.
# 
# net/core/neighbour.c
#   2004/10/15 13:26:11+02:00 michal@xxxxxxxxxxxxxx +3 -0
#   Fix 1 missing bit for ! CONFIG_PROC_FS setup.
# 
diff -Nru a/net/core/neighbour.c b/net/core/neighbour.c
--- a/net/core/neighbour.c 2004-10-15 14:25:44 +02:00
+++ b/net/core/neighbour.c 2004-10-15 14:25:44 +02:00
@@ -61,7 +61,10 @@
 
 static int neigh_glbl_allocs;
 static struct neigh_table *neigh_tables;
+
+#ifdef CONFIG_PROC_FS
 static struct file_operations neigh_stat_seq_fops;
+#endif
 
 /*
    Neighbour hash table buckets are protected with rwlock tbl->lock.
diff -Nru a/net/ipv6/netfilter/ip6_queue.c 
b/net/ipv6/netfilter/ip6_queue.c
--- a/net/ipv6/netfilter/ip6_queue.c 2004-10-15 14:25:44 +02:00
+++ b/net/ipv6/netfilter/ip6_queue.c 2004-10-15 14:25:44 +02:00
@@ -622,6 +622,7 @@
  { .ctl_name = 0 }
 };
 
+#ifdef CONFIG_PROC_FS
 static int
 ipq_get_info(char *buffer, char **start, off_t offset, int length)
 {
@@ -651,6 +652,7 @@
   len = 0;
  return len;
 }
+#endif
 
 static int
 init_or_cleanup(int init)
diff -Nru a/net/ipv6/route.c b/net/ipv6/route.c
--- a/net/ipv6/route.c 2004-10-15 14:25:44 +02:00
+++ b/net/ipv6/route.c 2004-10-15 14:25:44 +02:00
@@ -2066,7 +2066,9 @@
 
 void __init ip6_route_init(void)
 {
+#ifdef  CONFIG_PROC_FS
  struct proc_dir_entry *p;
+#endif
 
  ip6_dst_ops.kmem_cachep = kmem_cache_create("ip6_dst_cache",
            sizeof(struct rt6_info),
diff -Nru a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
--- a/net/ipv6/tcp_ipv6.c 2004-10-15 14:25:44 +02:00
+++ b/net/ipv6/tcp_ipv6.c 2004-10-15 14:25:44 +02:00
@@ -1960,6 +1960,7 @@
 }
 
 /* Proc filesystem TCPv6 sock list dumping. */
+#ifdef CONFIG_PROC_FS
 static void get_openreq6(struct seq_file *seq, 
     struct sock *sk, struct open_request *req, int i, int uid)
 {
@@ -2070,7 +2071,6 @@
      atomic_read(&tw->tw_refcnt), tw);
 }
 
-#ifdef CONFIG_PROC_FS
 static int tcp6_seq_show(struct seq_file *seq, void *v)
 {
  struct tcp_iter_state *st;
diff -Nru a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
--- a/net/irda/ircomm/ircomm_tty.c 2004-10-15 14:25:44 +02:00
+++ b/net/irda/ircomm/ircomm_tty.c 2004-10-15 14:25:44 +02:00
@@ -1268,6 +1268,7 @@
  self->flow = cmd;
 }
 
+#ifdef CONFIG_PROC_FS
 static int ircomm_tty_line_info(struct ircomm_tty_cb *self, char *buf)
 {
         int  ret=0;
@@ -1377,7 +1378,6 @@
  *    
  *
  */
-#ifdef CONFIG_PROC_FS
 static int ircomm_tty_read_proc(char *buf, char **start, off_t offset, 
int len,
     int *eof, void *unused)
 {

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/