* #ifdef for extra proc_dointvec parameter under linux 2.6.8 in ranal and

   openibnal (bz 7217)

*  remove WIRE_ATTR from iibanl kib_md_t (it's not a wire struct)

diff --git a/lnet/klnds/iiblnd/iiblnd.h b/lnet/klnds/iiblnd/iiblnd.h
index 32f2921..e16bd4c 100644 (file)
--- a/lnet/klnds/iiblnd/iiblnd.h
+++ b/lnet/klnds/iiblnd/iiblnd.h
@@ -162,7 +162,7 @@ typedef struct
         __u32             md_lkey;
         __u32             md_rkey;
         __u64             md_addr;
-} kib_md_t __attribute__((packed));
+} kib_md_t;
 
 typedef struct
 {

diff --git a/lnet/klnds/openiblnd/openiblnd.c b/lnet/klnds/openiblnd/openiblnd.c
index 3862c5b..d0385a6 100644 (file)
--- a/lnet/klnds/openiblnd/openiblnd.c
+++ b/lnet/klnds/openiblnd/openiblnd.c
@@ -821,9 +821,15 @@ kibnal_stop_ip_listener(int clear_acceptq)
         }
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8)
 int 
 kibnal_listener_procint(ctl_table *table, int write, struct file *filp,
                         void *buffer, size_t *lenp)
+#else
+int 
+kibnal_listener_procint(ctl_table *table, int write, struct file *filp,
+                        void *buffer, size_t *lenp, loff_t *ppos)
+#endif
 {
         int   *tunable = (int *)table->data;
         int    old_val;
@@ -839,8 +845,11 @@ kibnal_listener_procint(ctl_table *table, int write, struct file *filp,
                  tunable == &kibnal_tunables.kib_backlog);
         old_val = *tunable;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8)
         rc = proc_dointvec(table, write, filp, buffer, lenp);
-
+#else
+        rc = proc_dointvec(table, write, filp, buffer, lenp, ppos);
+#endif
         if (write &&
             (*tunable != old_val ||
              kibnal_data.kib_listener_sock == NULL)) {

diff --git a/lnet/klnds/ralnd/ralnd.c b/lnet/klnds/ralnd/ralnd.c
index f984e6f..eb13d73 100644 (file)
--- a/lnet/klnds/ralnd/ralnd.c
+++ b/lnet/klnds/ralnd/ralnd.c
@@ -1200,9 +1200,15 @@ kranal_stop_listener(int clear_acceptq)
         }
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8)
 int
 kranal_listener_procint(ctl_table *table, int write, struct file *filp,
                         void *buffer, size_t *lenp)
+#else
+int
+kranal_listener_procint(ctl_table *table, int write, struct file *filp,
+                        void *buffer, size_t *lenp, loff_t *ppos)
+#endif
 {
         int   *tunable = (int *)table->data;
         int    old_val;
@@ -1218,7 +1224,11 @@ kranal_listener_procint(ctl_table *table, int write, struct file *filp,
                  tunable == &kranal_tunables.kra_backlog);
         old_val = *tunable;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8)
         rc = proc_dointvec(table, write, filp, buffer, lenp);
+#else
+        rc = proc_dointvec(table, write, filp, buffer, lenp, ppos);
+#endif
 
         if (write &&
             (*tunable != old_val ||