patch-2.1.116 linux/net/ipv4/arp.c

Next file: linux/net/ipv4/ip_fragment.c
Previous file: linux/net/econet/econet.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.115/linux/net/ipv4/arp.c linux/net/ipv4/arp.c
@@ -163,7 +163,7 @@
 	dev_queue_xmit
 };
 
-#if defined(CONFIG_AX25) || defined(CONFIG_AX25) || \
+#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) || \
     defined(CONFIG_SHAPER) || defined(CONFIG_SHAPER_MODULE)
 struct neigh_ops arp_broken_ops =
 {
@@ -261,7 +261,7 @@
 		default:
 			break;
 		case ARPHRD_ROSE:	
-#if defined(CONFIG_AX25) || defined(CONFIG_AX25)
+#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 		case ARPHRD_AX25:
 #if defined(CONFIG_NETROM) || defined(CONFIG_NETROM_MODULE)
 		case ARPHRD_NETROM:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov