patch-1.3.39 linux/net/ipv4/ipip.c

• Lines: 51
• Date: Thu Nov 9 08:24:09 1995
• Orig file: v1.3.38/linux/net/ipv4/ipip.c
• Orig date: Wed Nov 8 07:11:46 1995

diff -u --recursive --new-file v1.3.38/linux/net/ipv4/ipip.c linux/net/ipv4/ipip.c
@@ -19,28 +19,26 @@
  *
  */
  
+#include <linux/module.h>
+
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/in.h>
+#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <linux/firewall.h>
+#include <linux/config.h>	/* For CONFIG_FIREWALL */
+
 #include <net/datalink.h>
 #include <net/sock.h>
 #include <net/ip.h>
 #include <net/icmp.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
 #include <net/protocol.h>
 #include <net/ipip.h>
-#include <linux/firewall.h>
-
-#include <linux/config.h>
-
-#include <linux/module.h>
-
-#if ( defined(CONFIG_NET_IPIP) && defined(CONFIG_IP_FORWARD)) || defined(MODULE)
-
 
 /*
  *	The IPIP protocol driver.
@@ -114,6 +112,7 @@
 }
 
 #ifdef MODULE
+
 static struct inet_protocol ipip_protocol = {
   ipip_rcv,             /* IPIP handler          */
   NULL,                 /* Will be UDP fraglist handler */
@@ -142,5 +141,4 @@
 		printk("ipip close: can't remove protocol\n");
 }
 
-#endif
 #endif