patch-2.1.15 linux/net/ipv4/protocol.c

• Lines: 48
• Date: Thu Dec 12 16:54:24 1996
• Orig file: v2.1.14/linux/net/ipv4/protocol.c
• Orig date: Sun Nov 10 20:12:29 1996

diff -u --recursive --new-file v2.1.14/linux/net/ipv4/protocol.c linux/net/ipv4/protocol.c
@@ -46,13 +46,12 @@
 #include <linux/igmp.h>
 
 
-#ifdef CONFIG_IP_FORWARD
 #ifdef CONFIG_NET_IPIP
 
 static struct inet_protocol ipip_protocol = 
 {
 	ipip_rcv,             /* IPIP handler          */
-	NULL,                 /* TUNNEL error control    */
+	ipip_err,             /* TUNNEL error control    */
 	0,                    /* next                 */
 	IPPROTO_IPIP,         /* protocol ID          */
 	0,                    /* copy                 */
@@ -62,13 +61,12 @@
 
 
 #endif
-#endif
 
 static struct inet_protocol tcp_protocol = 
 {
 	tcp_v4_rcv,		/* TCP handler		*/
 	tcp_v4_err,		/* TCP error control	*/  
-#if defined(CONFIG_NET_IPIP) && defined(CONFIG_IP_FORWARD)
+#ifdef CONFIG_NET_IPIP
 	&ipip_protocol,
 #else  
 	NULL,			/* next			*/
@@ -103,9 +101,6 @@
 	"ICMP"			/* name			*/
 };
 
-#ifndef CONFIG_IP_MULTICAST
-struct inet_protocol *inet_protocol_base = &icmp_protocol;
-#else
 static struct inet_protocol igmp_protocol = 
 {
 	igmp_rcv,		/* IGMP handler		*/
@@ -118,7 +113,6 @@
 };
 
 struct inet_protocol *inet_protocol_base = &igmp_protocol;
-#endif
 
 struct inet_protocol *inet_protos[MAX_INET_PROTOS] = 
 {