From b94b2ae871054f14ed91ec19c5fbcb75cdfb8e00 Mon Sep 17 00:00:00 2001
From: Jing Min Zhao <zhaojingmin@vivecode.com>
Date: Thu, 24 May 2007 16:43:07 -0700
Subject: [PATCH] --- yaml --- r: 56985 b: refs/heads/master c:
 bb807245ef981cac7e8550aea365e6f2157d5c4d h: refs/heads/master i:   56983:
 863c7ddd95937a17943fc9b81de58aaab9634076 v: v3

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

diff --git a/[refs] b/[refs]
index 1a800ec922a2..7ef8f7d34e3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d052918688bdd7a1218aa5ae182013bf45a4881a
+refs/heads/master: bb807245ef981cac7e8550aea365e6f2157d5c4d
diff --git a/trunk/net/netfilter/nf_conntrack_h323_main.c b/trunk/net/netfilter/nf_conntrack_h323_main.c
index b284db73ca7c..8bb99b3675b7 100644
--- a/trunk/net/netfilter/nf_conntrack_h323_main.c
+++ b/trunk/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: