From: Jing Min Zhao <zhaojingmin@vivecode.com>
Date: Thu, 24 May 2007 23:43:07 +0000 (-0700)
Subject: [NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access
X-Git-Tag: v2.6.22-rc3~9^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bb807245ef981cac7e8550aea365e6f2157d5c4d;p=linux-2.6-omap-h63xx.git

[NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access

Update get_h225_addr() to meet the changes in ASN.1 types. It was using
field ip6 to access IPv6 TransportAddress, it should be ip according the
ASN.1 definition.

Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index b284db73ca7..8bb99b3675b 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -640,7 +640,7 @@ int get_h225_addr(struct nf_conn *ct, unsigned char *data,
 	case eTransportAddress_ip6Address:
 		if (family != AF_INET6)
 			return 0;
-		p = data + taddr->ip6Address.ip6;
+		p = data + taddr->ip6Address.ip;
 		len = 16;
 		break;
 	default: