patch-pre2.0.3 linux/net/ipv4/ipip.c

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

diff -u --recursive --new-file pre2.0.2/linux/net/ipv4/ipip.c linux/net/ipv4/ipip.c
@@ -21,7 +21,6 @@
  
 #include <linux/module.h>
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -31,7 +30,6 @@
 #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>
@@ -53,9 +51,6 @@
 		__u32 daddr, unsigned short len, __u32 saddr,
                                    int redo, struct inet_protocol *protocol)
 {
-#ifdef CONFIG_FIREWALL
-	int err;
-#endif
 	/* Don't unlink in the middle of a turnaround */
 	MOD_INC_USE_COUNT;
 #ifdef TUNNEL_DEBUG
@@ -116,7 +111,7 @@
 void cleanup_module( void) 
 {
 	if ( inet_del_protocol(&ipip_protocol) < 0 )
-		printk("ipip close: can't remove protocol\n");
+		printk(KERN_INFO "ipip close: can't remove protocol\n");
 }
 
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this