[Osdlcluster-tipc] patch for tipc 0.98

[Mark H. <ma...@os...>]

Jon,

This patch enabled compiling and running on 2.6.0-test3

Mark.

diff -Nru tipc-0.98/TipcLinuxModAdaptation_SCC/src/ethernet_adaptation.c tipc-0.98.new/TipcLinuxModAdaptation_SCC/src/ethernet_adaptation.c
--- tipc-0.98/TipcLinuxModAdaptation_SCC/src/ethernet_adaptation.c	2003-07-16 01:30:14.000000000 -0700
+++ tipc-0.98.new/TipcLinuxModAdaptation_SCC/src/ethernet_adaptation.c	2003-08-14 08:05:40.000000000 -0700
@@ -238,7 +238,7 @@
    b->tipc_packet_type.dev = dev;
    b->tipc_packet_type.func = dataInd;
    b->tipc_packet_type.data = b;
-#ifdef TIPC_LINUX_2_5
+#ifndef TIPC_LINUX_2_4
    INIT_LIST_HEAD(&(b->tipc_packet_type.list));
 #else
    b->tipc_packet_type.next = NULL;    
@@ -249,7 +249,7 @@
    b->config_packet_type.dev = dev;
    b->config_packet_type.func = configDataInd;
    b->config_packet_type.data = b;
-#ifdef TIPC_LINUX_2_5
+#ifndef TIPC_LINUX_2_4
    INIT_LIST_HEAD(&(b->config_packet_type.list));
 #else
    b->config_packet_type.next = NULL;
diff -Nru tipc-0.98/TipcLinuxModAdaptation_SCC/src/socket_adaptation.c tipc-0.98.new/TipcLinuxModAdaptation_SCC/src/socket_adaptation.c
--- tipc-0.98/TipcLinuxModAdaptation_SCC/src/socket_adaptation.c	2003-07-16 01:57:16.000000000 -0700
+++ tipc-0.98.new/TipcLinuxModAdaptation_SCC/src/socket_adaptation.c	2003-08-14 08:12:59.000000000 -0700
@@ -194,7 +194,7 @@
 
 
 /* /////////////////////// Create a TIPC port: //////////////////// */
-#ifndef TIPC_LINUX_2_5
+#ifdef TIPC_LINUX_2_4
 #define get_tipc_sock(sock) ((sock)->sk ? (tipc_sock *)(sock)->sk->protinfo.af_unix.other:0)
 #define put_tipc_sock(sk, tipcsk) do { (sk)->protinfo.af_unix.other=(struct sock*)(tipcsk); } while(0)
 #define sk_alloc_comp(family, priority, size)  sk_alloc(family, priority, size)
@@ -239,7 +239,7 @@
       return -ENOMEM;
     }
     sock_init_data(sock,sk);
-#ifndef TIPC_LINUX_2_5
+#ifdef TIPC_LINUX_2_4
     sk->family = AF_TIPC;
 #else
     sk->sk_family = AF_TIPC;
@@ -482,7 +482,7 @@
 }
 
 /* ////////////////////// Send  message: ////////////////////// */
-#ifndef TIPC_LINUX_2_5
+#ifdef TIPC_LINUX_2_4
 static int tipc_sk_sendmsg(struct socket *sock, struct msghdr *m,
 			   int total_len,struct scm_cookie *scm)
 #else
@@ -676,7 +676,7 @@
 }
 
 /* ////////////////////// Read message to user space: //////////////////// */
-#ifndef TIPC_LINUX_2_5
+#ifdef TIPC_LINUX_2_4
 static int tipc_sk_recvmsg(struct socket *sock, struct msghdr *m,
                         int total_len, int flags,struct scm_cookie *scm)
 #else
diff -Nru tipc-0.98/TipcLinuxModAdaptation_SCC/src/tipc_start.c tipc-0.98.new/TipcLinuxModAdaptation_SCC/src/tipc_start.c
--- tipc-0.98/TipcLinuxModAdaptation_SCC/src/tipc_start.c	2003-07-15 08:27:17.000000000 -0700
+++ tipc-0.98.new/TipcLinuxModAdaptation_SCC/src/tipc_start.c	2003-08-14 08:13:48.000000000 -0700
@@ -67,7 +67,7 @@
 #include <tipc_adaptation_locks.h>
 #include <linux/random.h>
 
-#ifndef TIPC_LINUX_2_5
+#ifdef TIPC_LINUX_2_4
 EXPORT_NO_SYMBOLS;
 #endif
 
diff -Nru tipc-0.98/TipcLinuxModAdaptation_SCC/src/udp_adaptation.c tipc-0.98.new/TipcLinuxModAdaptation_SCC/src/udp_adaptation.c
--- tipc-0.98/TipcLinuxModAdaptation_SCC/src/udp_adaptation.c	2003-07-16 02:11:04.000000000 -0700
+++ tipc-0.98.new/TipcLinuxModAdaptation_SCC/src/udp_adaptation.c	2003-08-14 08:14:05.000000000 -0700
@@ -316,7 +316,7 @@
         os_grab_lock();
         return false;
       }
-#ifndef TIPC_LINUX_2_5
+#ifdef TIPC_LINUX_2_4
       bearer.trafficSock->sk->data_ready = dataInd;
       bearer.trafficSock->sk->allocation = GFP_ATOMIC;
 #else
@@ -343,7 +343,7 @@
 	return false;
       }
       sk = bearer.listenerSock->sk;
-#ifndef TIPC_LINUX_2_5
+#ifdef TIPC_LINUX_2_4
       sk->data_ready = dataInd;
       sk->allocation = GFP_ATOMIC;
 #else

-- 
Mark Haverkamp <ma...@os...>