From 217890fde03a590d7b1442ac0d79eb85bc4a08dc Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 3 May 2006 23:17:11 -0700
Subject: [PATCH] --- yaml --- r: 26475 b: refs/heads/master c:
 4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7 h: refs/heads/master i:   26473:
 e5ecf94666c5894c563d9d73ba391d473b814075   26471:
 62e4bcd1a8a7cebe509a74993f5dd9b763b46a03 v: v3

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

diff --git a/[refs] b/[refs]
index 348559b32349..10cfefb8f352 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fd737031eb6869430d0f3cf6bf1440adf7aedf5
+refs/heads/master: 4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c b/trunk/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c
index 48078002e450..f52d2c45a6ae 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c
@@ -703,6 +703,10 @@ int decode_choice(bitstr_t * bs, field_t * f, char *base, int level)
 		type = get_bits(bs, f->sz);
 	}
 
+	/* Write Type */
+	if (base)
+		*(unsigned *) base = type;
+
 	/* Check Range */
 	if (type >= f->ub) {	/* Newer version? */
 		BYTE_ALIGN(bs);
@@ -712,10 +716,6 @@ int decode_choice(bitstr_t * bs, field_t * f, char *base, int level)
 		return H323_ERROR_NONE;
 	}
 
-	/* Write Type */
-	if (base)
-		*(unsigned *) base = type;
-
 	/* Transfer to son level */
 	son = &f->fields[type];
 	if (son->attr & STOP) {