patch-2.0.35 linux/fs/nfs/nfsroot.c

• Lines: 18
• Date: Mon Jul 13 13:47:35 1998
• Orig file: v2.0.34/linux/fs/nfs/nfsroot.c
• Orig date: Fri May 31 03:46:27 1996

diff -u --recursive --new-file v2.0.34/linux/fs/nfs/nfsroot.c linux/fs/nfs/nfsroot.c
@@ -79,7 +79,7 @@
 #include <linux/net.h>
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
-#ifdef CONFIG_AX25
+#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 #include <net/ax25.h>	/* For AX25_P_IP */
 #endif
 #include <linux/skbuff.h>
@@ -306,7 +306,7 @@
 
 	/* If it's not ethernet or AX25, delete it. */
 	if ((rarp->ar_pro != htons(ETH_P_IP) && dev->type != ARPHRD_AX25) ||
-#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_pln != 4) {