[PATCH] tunnel debugging cleanup patch

[Rusty Russell <rusty@xxxxxxxxxxxxxxxx>]

This should suppress the bogus debug messages when
CONFIG_NETFILTER_DEBUG is used with tunnels...

Rusty.
diff -urN -X /tmp/filezRIWiT --minimal linux-2.4.0-test7-7/net/ipv4/ip_gre.c 
working-2.4.0-test7-7/net/ipv4/ip_gre.c
--- linux-2.4.0-test7-7/net/ipv4/ip_gre.c       Wed Aug 23 18:12:54 2000
+++ working-2.4.0-test7-7/net/ipv4/ip_gre.c     Thu Aug 24 16:48:30 2000
@@ -632,6 +632,9 @@
 #ifdef CONFIG_NETFILTER
                nf_conntrack_put(skb->nfct);
                skb->nfct = NULL;
+#ifdef CONFIG_NETFILTER_DEBUG
+               skb->nf_debug = 0;
+#endif
 #endif
                ipgre_ecn_decapsulate(iph, skb);
                netif_rx(skb);
@@ -858,6 +861,9 @@
 #ifdef CONFIG_NETFILTER
        nf_conntrack_put(skb->nfct);
        skb->nfct = NULL;
+#ifdef CONFIG_NETFILTER_DEBUG
+       skb->nf_debug = 0;
+#endif
 #endif
 
        IPTUNNEL_XMIT();
diff -urN -X /tmp/filezRIWiT --minimal linux-2.4.0-test7-7/net/ipv4/ipip.c 
working-2.4.0-test7-7/net/ipv4/ipip.c
--- linux-2.4.0-test7-7/net/ipv4/ipip.c Wed Aug 23 18:12:54 2000
+++ working-2.4.0-test7-7/net/ipv4/ipip.c       Thu Aug 24 16:48:30 2000
@@ -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();
diff -urN -X /tmp/filezRIWiT --minimal linux-2.4.0-test7-7/net/ipv6/sit.c 
working-2.4.0-test7-7/net/ipv6/sit.c
--- linux-2.4.0-test7-7/net/ipv6/sit.c  Wed Aug 23 18:12:54 2000
+++ working-2.4.0-test7-7/net/ipv6/sit.c        Thu Aug 24 16:48:30 2000
@@ -401,6 +401,9 @@
 #ifdef CONFIG_NETFILTER
                nf_conntrack_put(skb->nfct);
                skb->nfct = NULL;
+#ifdef CONFIG_NETFILTER_DEBUG
+               skb->nf_debug = 0;
+#endif
 #endif
                ipip6_ecn_decapsulate(iph, skb);
                netif_rx(skb);
@@ -567,6 +570,9 @@
 #ifdef CONFIG_NETFILTER
        nf_conntrack_put(skb->nfct);
        skb->nfct = NULL;
+#ifdef CONFIG_NETFILTER_DEBUG
+       skb->nf_debug = 0;
+#endif
 #endif
 
        IPTUNNEL_XMIT();

--
Hacking time.