patch-2.3.99-pre2 linux/net/ipv4/ip_gre.c

• Lines: 23
• Date: Fri Mar 17 10:56:20 2000
• Orig file: v2.3.99-pre1/linux/net/ipv4/ip_gre.c
• Orig date: Tue Jan 11 22:31:46 2000

diff -u --recursive --new-file v2.3.99-pre1/linux/net/ipv4/ip_gre.c linux/net/ipv4/ip_gre.c
@@ -599,6 +599,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(&ipgre_lock);
 		return(0);
@@ -817,6 +821,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++;