patch-2.0.35 linux/net/ipv4/rarp.c

• Lines: 36
• Date: Mon Jul 13 13:47:41 1998
• Orig file: v2.0.34/linux/net/ipv4/rarp.c
• Orig date: Mon Jul 13 13:46:43 1998

diff -u --recursive --new-file v2.0.34/linux/net/ipv4/rarp.c linux/net/ipv4/rarp.c
@@ -61,7 +61,7 @@
 #include <net/sock.h>
 #include <net/arp.h>
 #include <net/rarp.h>
-#ifdef CONFIG_AX25
+#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 #include <net/ax25.h>
 #endif
 #include <linux/proc_fs.h>
@@ -97,7 +97,7 @@
 	NULL
 };
 
-static initflag = 1;
+static int initflag = 1;
 
 
 /*
@@ -268,7 +268,7 @@
  */
 
 	if (
-#ifdef CONFIG_AX25
+#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 		(rarp->ar_pro != htons(AX25_P_IP) && dev->type == ARPHRD_AX25) ||
 #endif
 		(rarp->ar_pro != htons(ETH_P_IP) && dev->type != ARPHRD_AX25)
@@ -347,7 +347,7 @@
 			htype = ARPHRD_ETHER;
 			hlen = ETH_ALEN;
 			break;
-#ifdef CONFIG_AX25
+#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 		case ARPHRD_AX25:
 			htype = ARPHRD_AX25;
 			hlen = 7;