diff options
| author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2006-11-06 13:06:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-11-21 19:16:27 -0500 |
| commit | 53ab61c6d8f391bda04dbc1e95bac348fe81103b (patch) | |
| tree | 96476b54d922cba09aac0861a0e064aab1f4ae54 /net/ipv6/ip6_tunnel.c | |
| parent | b3fdd9f115c776d381b30b296849f8e4046bcdaa (diff) | |
[IPV6] IP6TUNNEL: Add missing nf_reset() on input path.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index c8d4160385f6..b9f40290d12a 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
| @@ -542,6 +542,7 @@ ip6ip6_rcv(struct sk_buff *skb) | |||
| 542 | skb->dev = t->dev; | 542 | skb->dev = t->dev; |
| 543 | dst_release(skb->dst); | 543 | dst_release(skb->dst); |
| 544 | skb->dst = NULL; | 544 | skb->dst = NULL; |
| 545 | nf_reset(skb); | ||
| 545 | if (t->parms.flags & IP6_TNL_F_RCV_DSCP_COPY) | 546 | if (t->parms.flags & IP6_TNL_F_RCV_DSCP_COPY) |
| 546 | ipv6_copy_dscp(ipv6h, skb->nh.ipv6h); | 547 | ipv6_copy_dscp(ipv6h, skb->nh.ipv6h); |
| 547 | ip6ip6_ecn_decapsulate(ipv6h, skb); | 548 | ip6ip6_ecn_decapsulate(ipv6h, skb); |