[H.323] Compilation fixes for 2.6.14

[Vinay K Nallamothu <vinay.nallamothu@xxxxxxxxxxx>]

Hi,

ip_conntrack_expect_alloc expects an argument in 2.6.14 (didn't check
2.6.13).

I got the following compilation errors while trying to compile H.323
module using patch-o-matic-ng-20051219.tar.bz2 against linux-2.6.14

net/ipv4/netfilter/ip_conntrack_h323_h225.c: In function `h225_parse_connect_uuie':
net/ipv4/netfilter/ip_conntrack_h323_h225.c:111: error: too few arguments to function `ip_conntrack_expect_alloc'

Patch below:
 ip_conntrack_h323_h225.c |    2 +-
 ip_conntrack_h323_h245.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


diff -urN a/net/ipv4/netfilter/ip_conntrack_h323_h225.c b/net/ipv4/netfilter/ip_conntrack_h323_h225.c
--- a/net/ipv4/netfilter/ip_conntrack_h323_h225.c	2005-12-23 14:32:53.000000000 +0530
+++ b/net/ipv4/netfilter/ip_conntrack_h323_h225.c	2005-12-23 14:32:29.000000000 +0530
@@ -108,7 +108,7 @@
 		}
 		if (ret && ip == ct->tuplehash[dir].tuple.src.ip) {
 			/* match found: create an expectation */
-			exp = ip_conntrack_expect_alloc();
+			exp = ip_conntrack_expect_alloc(ct);
 			if (exp == NULL)
 				return NF_ACCEPT;
 
diff -urN a/net/ipv4/netfilter/ip_conntrack_h323_h245.c b/net/ipv4/netfilter/ip_conntrack_h323_h245.c
--- a/net/ipv4/netfilter/ip_conntrack_h323_h245.c	2005-12-23 14:32:53.000000000 +0530
+++ b/net/ipv4/netfilter/ip_conntrack_h323_h245.c	2005-12-23 14:32:29.000000000 +0530
@@ -296,7 +296,7 @@
 			       NIPQUAD(ip), ntohs(port));
 		if (ret && ip == ct->tuplehash[dir].tuple.src.ip) {
 			/* match found: create an expectation */
-			exp = ip_conntrack_expect_alloc();
+			exp = ip_conntrack_expect_alloc(ct);
 			if (exp == NULL)
 				return NF_ACCEPT;
 
@@ -348,7 +348,7 @@
 			       NIPQUAD(ip), ntohs(port));
 		if (ret && ip == ct->tuplehash[dir].tuple.src.ip) {
 			/* match found: create an expectation */
-			exp = ip_conntrack_expect_alloc();
+			exp = ip_conntrack_expect_alloc(ct);
 			if (exp == NULL)
 				return NF_ACCEPT;
 
@@ -616,7 +616,7 @@
 		       ret, i, ip, port);
 		if (ret && ip == ct->tuplehash[dir].tuple.src.ip) {
 			/* match found: create an expectation */
-			exp = ip_conntrack_expect_alloc();
+			exp = ip_conntrack_expect_alloc(ct);
 			if (exp == NULL)
 				return NF_ACCEPT;
 
@@ -663,7 +663,7 @@
 		       ret, i, ip, port);
 		if (ret && ip == ct->tuplehash[dir].tuple.src.ip) {
 			/* match found: create an expectation */
-			exp = ip_conntrack_expect_alloc();
+			exp = ip_conntrack_expect_alloc(ct);
 			if (exp == NULL)
 				return NF_ACCEPT;
 




-- 
Views expressed in this mail are those of the individual sender and 
do not bind Gsec1 Limited. or its subsidiary, unless the sender has done
so expressly with due authority of Gsec1.
_________________________________________________________________________