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

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

diff --git a/[refs] b/[refs]
index 776c3ae6fde3..2d6831e345d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 596830f1a1e5d26a83fe83b99ced1456d9d7f39b
+refs/heads/master: f8f1c08eaef838e22bf427665da87cfa73e5074d
diff --git a/trunk/net/netfilter/nf_conntrack_h323_main.c b/trunk/net/netfilter/nf_conntrack_h323_main.c
index 6d668af4f999..a1b95acad297 100644
--- a/trunk/net/netfilter/nf_conntrack_h323_main.c
+++ b/trunk/net/netfilter/nf_conntrack_h323_main.c
@@ -520,6 +520,16 @@ static int process_olca(struct sk_buff **pskb, struct nf_conn *ct,
 		}
 	}
 
+	if ((olca->options & eOpenLogicalChannelAck_separateStack) &&
+		olca->separateStack.networkAddress.choice ==
+		eNetworkAccessParameters_networkAddress_localAreaAddress) {
+		ret = expect_t120(pskb, ct, ctinfo, data, dataoff,
+				  &olca->separateStack.networkAddress.
+				  localAreaAddress);
+		if (ret < 0)
+			return -1;
+	}
+
 	return 0;
 }