patch-2.4.0-test8 linux/net/ipv4/ipip.c

• Lines: 29
• Date: Mon Aug 28 12:03:10 2000
• Orig file: v2.4.0-test7/linux/net/ipv4/ipip.c
• Orig date: Wed Aug 9 19:19:51 2000

diff -u --recursive --new-file v2.4.0-test7/linux/net/ipv4/ipip.c linux/net/ipv4/ipip.c
@@ -1,7 +1,7 @@
 /*
  *	Linux NET3:	IP/IP protocol decoder. 
  *
- *	Version: $Id: ipip.c,v 1.38 2000/08/02 06:03:59 davem Exp $
+ *	Version: $Id: ipip.c,v 1.39 2000/08/25 02:15:47 davem Exp $
  *
  *	Authors:
  *		Sam Lantinga (slouken@cs.ucdavis.edu)  02/01/95
@@ -496,6 +496,9 @@
 #ifdef CONFIG_NETFILTER
 		nf_conntrack_put(skb->nfct);
 		skb->nfct = NULL;
+#ifdef CONFIG_NETFILTER_DEBUG
+		skb->nf_debug = 0;
+#endif
 #endif
 		ipip_ecn_decapsulate(iph, skb);
 		netif_rx(skb);
@@ -639,6 +642,9 @@
 #ifdef CONFIG_NETFILTER
 	nf_conntrack_put(skb->nfct);
 	skb->nfct = NULL;
+#ifdef CONFIG_NETFILTER_DEBUG
+	skb->nf_debug = 0;
+#endif
 #endif
 
 	IPTUNNEL_XMIT();