diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
| commit | 16b5d462f73eb29d1f67fa01cc1ea66afdc72569 (patch) | |
| tree | 5407bd573f4840e473ea27cbe61e5c7a07131fcd /net/ipv4/ip_gre.c | |
| parent | ce8a076e11e7e5ee36007f9a3eee5bb3744cb8f6 (diff) | |
Merge with Linux 2.3.99-pre2.
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 8d651b042..01a39b6e4 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -599,6 +599,10 @@ int ipgre_rcv(struct sk_buff *skb, unsigned short len) 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); @@ -818,6 +822,11 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) 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++; ip_send(skb); |