Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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;