patch-2.4.0-test6 linux/net/ipv4/arp.c

• Lines: 42
• Date: Fri Aug 4 18:18:49 2000
• Orig file: v2.4.0-test5/linux/net/ipv4/arp.c
• Orig date: Mon Jul 10 16:47:28 2000

diff -u --recursive --new-file v2.4.0-test5/linux/net/ipv4/arp.c linux/net/ipv4/arp.c
@@ -1,6 +1,6 @@
 /* linux/net/inet/arp.c
  *
- * Version:	$Id: arp.c,v 1.87 2000/07/07 22:40:35 davem Exp $
+ * Version:	$Id: arp.c,v 1.88 2000/08/02 06:05:02 davem Exp $
  *
  * Copyright (C) 1994 by Florian  La Roche
  *
@@ -122,9 +122,6 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
-#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
-static char *ax2asc2(ax25_address *a, char *buf);
-#endif
 
 
 /*
@@ -1015,6 +1012,9 @@
 #ifndef CONFIG_PROC_FS
 static int arp_get_info(char *buffer, char **start, off_t offset, int length) { return 0; }
 #else
+#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+static char *ax2asc2(ax25_address *a, char *buf);
+#endif
 #define HBUFFERLEN 30
 
 static int arp_get_info(char *buffer, char **start, off_t offset, int length)
@@ -1168,6 +1168,7 @@
 }
 
 
+#ifdef CONFIG_PROC_FS
 #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 
 /*
@@ -1201,4 +1202,5 @@
 
 }
 
+#endif
 #endif