From 750d24714cffa5977c209ac9be991d3f4942523f Mon Sep 17 00:00:00 2001
From: Jing Min Zhao <zhaojingmin@vivecode.com>
Date: Thu, 24 May 2007 16:43:42 -0700
Subject: [PATCH] --- yaml --- r: 56986 b: refs/heads/master c:
 596830f1a1e5d26a83fe83b99ced1456d9d7f39b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7ef8f7d34e3a..776c3ae6fde3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb807245ef981cac7e8550aea365e6f2157d5c4d
+refs/heads/master: 596830f1a1e5d26a83fe83b99ced1456d9d7f39b
diff --git a/trunk/net/netfilter/nf_conntrack_h323_main.c b/trunk/net/netfilter/nf_conntrack_h323_main.c
index 8bb99b3675b7..6d668af4f999 100644
--- a/trunk/net/netfilter/nf_conntrack_h323_main.c
+++ b/trunk/net/netfilter/nf_conntrack_h323_main.c
@@ -976,30 +976,6 @@ static int process_alerting(struct sk_buff **pskb, struct nf_conn *ct,
 	return 0;
 }
 
-/****************************************************************************/
-static int process_information(struct sk_buff **pskb,
-			       struct nf_conn *ct,
-			       enum ip_conntrack_info ctinfo,
-			       unsigned char **data, int dataoff,
-			       Information_UUIE *info)
-{
-	int ret;
-	int i;
-
-	DEBUGP("nf_ct_q931: Information\n");
-
-	if (info->options & eInformation_UUIE_fastStart) {
-		for (i = 0; i < info->fastStart.count; i++) {
-			ret = process_olc(pskb, ct, ctinfo, data, dataoff,
-					  &info->fastStart.item[i]);
-			if (ret < 0)
-				return -1;
-		}
-	}
-
-	return 0;
-}
-
 /****************************************************************************/
 static int process_facility(struct sk_buff **pskb, struct nf_conn *ct,
 			    enum ip_conntrack_info ctinfo,
@@ -1096,11 +1072,6 @@ static int process_q931(struct sk_buff **pskb, struct nf_conn *ct,
 		ret = process_alerting(pskb, ct, ctinfo, data, dataoff,
 				       &pdu->h323_message_body.alerting);
 		break;
-	case eH323_UU_PDU_h323_message_body_information:
-		ret = process_information(pskb, ct, ctinfo, data, dataoff,
-					  &pdu->h323_message_body.
-					  information);
-		break;
 	case eH323_UU_PDU_h323_message_body_facility:
 		ret = process_facility(pskb, ct, ctinfo, data, dataoff,
 				       &pdu->h323_message_body.facility);