Merge branch 'proc-cmdline' (/proc/<pid>/cmdline fixes)

[linux-2.6-block.git] / net / ipv6 / netfilter / nf_conntrack_reasm.c

diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 398e1df414060068dc6b0b8b4cca2e40884a730b..0f82c150543b75f42c35f0199244a3a8cf5dd3f7 100644 (file)
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -414,7 +414,7 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff)
                if (skb_copy_bits(skb, start, &hdr, sizeof(hdr)))
                        BUG();
                if (nexthdr == NEXTHDR_AUTH)
-                       hdrlen = (hdr.hdrlen+2)<<2;
+                       hdrlen = ipv6_authlen(&hdr);
                else
                        hdrlen = ipv6_optlen(&hdr);