From 8ef94cd027650c76222785fd8f2bd5d13e278fbf Mon Sep 17 00:00:00 2001
From: Christoph Paasch <christoph.paasch@gmail.com>
Date: Mon, 16 Mar 2009 15:52:11 +0100
Subject: [PATCH] --- yaml --- r: 132527 b: refs/heads/master c:
 d1238d5337e8e53cddea77c2a26d26b6eb5a982f h: refs/heads/master i:   132525:
 d5cf2be2291ea1d791f7a5ea7521c3210f541d8d   132523:
 cc1f58f21f2dfc12066a7f7a0a76ed4f7d4b51fe   132519:
 71bc6c1a8a236cdff17110c98dce78888d31cd9d   132511:
 d9bb68e4acdea9e9c3ae53e3d75f52b48838ea4f v: v3

---
 [refs]                                        | 2 +-
 trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d12349754219..95c3aceae9c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec8d540969da9a70790e9028d57b5b577dd7aa77
+refs/heads/master: d1238d5337e8e53cddea77c2a26d26b6eb5a982f
diff --git a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
index ed4d79a9e4a6..058a5e4a60c3 100644
--- a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -528,14 +528,14 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff)
 		if (!ipv6_ext_hdr(nexthdr)) {
 			return -1;
 		}
-		if (len < (int)sizeof(struct ipv6_opt_hdr)) {
-			pr_debug("too short\n");
-			return -1;
-		}
 		if (nexthdr == NEXTHDR_NONE) {
 			pr_debug("next header is none\n");
 			return -1;
 		}
+		if (len < (int)sizeof(struct ipv6_opt_hdr)) {
+			pr_debug("too short\n");
+			return -1;
+		}
 		if (skb_copy_bits(skb, start, &hdr, sizeof(hdr)))
 			BUG();
 		if (nexthdr == NEXTHDR_AUTH)