diff options
author | David Woodhouse | 2006-05-06 20:59:18 +0200 |
---|---|---|
committer | David Woodhouse | 2006-05-06 20:59:18 +0200 |
commit | 5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch) | |
tree | 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c | |
parent | Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) (diff) | |
parent | [TCP]: Fix snd_cwnd adjustments in tcp_highspeed.c (diff) | |
download | kernel-qcow2-linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.tar.gz kernel-qcow2-linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.tar.xz kernel-qcow2-linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c')
-rw-r--r-- | net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c b/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c index 48078002e450..355a53a5b6cd 100644 --- a/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c +++ b/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c @@ -2,7 +2,7 @@ * ip_conntrack_helper_h323_asn1.c - BER and PER decoding library for H.323 * conntrack/NAT module. * - * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@hotmail.com> + * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net> * * This source code is licensed under General Public License version 2. * @@ -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) { |