patch-2.0.30 linux/drivers/net/new_tunnel.c

• Lines: 22
• Date: Tue Apr 8 08:47:46 1997
• Orig file: v2.0.29/linux/drivers/net/new_tunnel.c
• Orig date: Thu Jul 18 22:24:05 1996

diff -u --recursive --new-file v2.0.29/linux/drivers/net/new_tunnel.c linux/drivers/net/new_tunnel.c
@@ -62,7 +62,6 @@
 */
 
 #include <linux/module.h>
-#include <linux/config.h>	/* for CONFIG_IP_FORWARD */
 
 /* Only two headers!! :-) */
 #include <net/ip.h>
@@ -303,9 +302,10 @@
 	 *	If ip_forward() made a copy, it will return 1 so we can free.
 	 */
 
-#ifdef CONFIG_IP_FORWARD
-	if (ip_forward(skb, dev, IPFWD_NOTTLDEC, target))
-#endif
+	if (sysctl_ip_forward) {
+		if (ip_forward(skb, dev, IPFWD_NOTTLDEC, target))
+			kfree_skb(skb, FREE_WRITE);
+	} else
 		kfree_skb(skb, FREE_WRITE);
 
 	/*