patch-2.3.99-pre2 linux/net/ipv6/sit.c

• Lines: 40
• Date: Sat Mar 18 16:51:36 2000
• Orig file: v2.3.99-pre1/linux/net/ipv6/sit.c
• Orig date: Thu Jan 6 12:57:48 2000

diff -u --recursive --new-file v2.3.99-pre1/linux/net/ipv6/sit.c linux/net/ipv6/sit.c
@@ -6,7 +6,7 @@
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *	Alexey Kuznetsov	<kuznet@ms2.inr.ac.ru>
  *
- *	$Id: sit.c,v 1.35 2000/01/06 00:42:08 davem Exp $
+ *	$Id: sit.c,v 1.36 2000/03/17 14:42:08 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -15,6 +15,7 @@
  */
 
 #define __NO_VERSION__
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/types.h>
@@ -388,6 +389,10 @@
 		skb->dev = tunnel->dev;
 		dst_release(skb->dst);
 		skb->dst = NULL;
+#ifdef CONFIG_NETFILTER
+		nf_conntrack_put(skb->nfct);
+		skb->nfct = NULL;
+#endif
 		netif_rx(skb);
 		read_unlock(&ipip6_lock);
 		return 0;
@@ -546,6 +551,11 @@
 	iph->tot_len		=	htons(skb->len);
 	ip_select_ident(iph, &rt->u.dst);
 	ip_send_check(iph);
+
+#ifdef CONFIG_NETFILTER
+	nf_conntrack_put(skb->nfct);
+	skb->nfct = NULL;
+#endif
 
 	stats->tx_bytes += skb->len;
 	stats->tx_packets++;