diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 06:32:25 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 06:32:25 +0300 |
| commit | b01a55a865eeac0371f1a73d36b134d23d938e1a (patch) | |
| tree | 06f8bcd5c006a17ad46ce3306254187dd5d8bf75 /net/ipv6/ip6_input.c | |
| parent | 940e3318c36394939d805e797d7be39ddaaa7911 (diff) | |
| parent | 482a8524f85a7d8c40c6fb5d072e85bc2fef327f (diff) | |
| download | linux-b01a55a865eeac0371f1a73d36b134d23d938e1a.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/ip6_input.c')
| -rw-r--r-- | net/ipv6/ip6_input.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index 6e3480426939..a6026d2787d2 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c @@ -176,6 +176,11 @@ resubmit: if (ipprot->flags & INET6_PROTO_FINAL) { struct ipv6hdr *hdr; + /* Free reference early: we don't need it any more, + and it may hold ip_conntrack module loaded + indefinitely. */ + nf_reset(skb); + skb_postpull_rcsum(skb, skb->nh.raw, skb->h.raw - skb->nh.raw); hdr = skb->nh.ipv6h; |