Landing b_hd_newconfig on HEAD

[fs/lustre-release.git] / lnet / klnds / socklnd / socklnd_lib-linux.h

diff --git a/lnet/klnds/socklnd/socklnd_lib-linux.h b/lnet/klnds/socklnd/socklnd_lib-linux.h
index 6129fdc..594f29f 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_lib-linux.h
+++ b/lnet/klnds/socklnd/socklnd_lib-linux.h
@@ -6,7 +6,9 @@
 #ifndef __LINUX_SOCKNAL_LIB_H__
 #define __LINUX_SOCKNAL_LIB_H__
 
+#ifdef HAVE_KERNEL_CONFIG_H
 #include <linux/config.h>
+#endif
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/version.h>
@@ -19,11 +21,11 @@
 #include <net/sock.h>
 #include <net/tcp.h>
 #include <linux/uio.h>
-                                                                                                                                                                         
+
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
-                                                                                                                                                                         
+
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/file.h>
@@ -38,35 +40,30 @@
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 # include <linux/syscalls.h>
 #endif
-                                                                                                                                                                       
+
 #include <libcfs/kp30.h>
 #include <libcfs/linux/portals_compat25.h>
 
-#define SOCKNAL_TX_LOW_WATER(sk) (((sk)->sk_sndbuf*8)/10)
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,72))
-# define sk_allocation  allocation
-# define sk_data_ready data_ready
-# define sk_write_space write_space
-# define sk_user_data   user_data
-# define sk_prot        prot
-# define sk_sndbuf      sndbuf
-# define sk_socket      socket
+#include <linux/crc32.h>
+static inline __u32 ksocknal_csum(__u32 crc, unsigned char const *p, size_t len)
+{
+#if 1
+        return crc32_le(crc, p, len);
+#else
+        while (len-- > 0)
+                crc = ((crc + 0x100) & ~0xff) | ((crc + *p++) & 0xff) ;
+        return crc;
 #endif
+}
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
-# define sk_wmem_queued wmem_queued
-# define sk_err         err
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,7))
+# define SOCKNAL_WSPACE(sk)       sk_stream_wspace(sk)
+# define SOCKNAL_MIN_WSPACE(sk)   sk_stream_min_wspace(sk)
+#else
+# define SOCKNAL_WSPACE(sk)     tcp_wspace(sk)
+# define SOCKNAL_MIN_WSPACE(sk) (((sk)->sk_sndbuf*8)/10)
 #endif
 
-#define SOCKNAL_ARCH_EAGER_ACK 0
-#define SOCK_WMEM_QUEUED(so)    ((so)->sk->sk_wmem_queued)
-#define SOCK_ERROR(so)          ((so)->sk->sk_err)
-#define SOCK_TEST_NOSPACE(so)  test_bit(SOCK_NOSPACE, &(so)->flags)
-
-#define KSN_SOCK2FILE(so)       ((so)->file)
-#define KSN_CONN2FILE(conn)     ((conn)->ksnc_sock->file)
-
 #ifndef CONFIG_SMP
 static inline
 int ksocknal_nsched(void)