Revert "b=21951 2.6.32-fc13 patchless client support for 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..610c949 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_lib-linux.h
+++ b/lnet/klnds/socklnd/socklnd_lib-linux.h
@@ -1,3 +1,39 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ */
+
 #define DEBUG_PORTAL_ALLOC
 #ifndef EXPORT_SYMTAB
 # define EXPORT_SYMTAB
@@ -6,7 +42,9 @@
 #ifndef __LINUX_SOCKNAL_LIB_H__
 #define __LINUX_SOCKNAL_LIB_H__
 
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
+#endif
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/version.h>
@@ -19,11 +57,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>
@@ -32,41 +70,35 @@
 #include <linux/kmod.h>
 #include <linux/sysctl.h>
 #include <asm/uaccess.h>
-#include <asm/segment.h>
 #include <asm/div64.h>
 
 #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)
+#include <libcfs/libcfs.h>
+#include <libcfs/linux/portals_compat25.h>
 
-#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)
@@ -75,7 +107,7 @@ int ksocknal_nsched(void)
 }
 #else
 #include <linux/lustre_version.h>
-# if !(defined(CONFIG_X86) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21))) || defined(CONFIG_X86_64) || (LUSTRE_KERNEL_VERSION < 39) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && !defined(CONFIG_X86_HT))
+# if !(defined(CONFIG_X86) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21))) || defined(CONFIG_X86_64) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && !defined(CONFIG_X86_HT))
 static inline int
 ksocknal_nsched(void)
 {