b=19808 2.6.29-fc11 patchless client support

[fs/lustre-release.git] / libcfs / include / libcfs / linux / linux-tcpip.h

diff --git a/libcfs/include/libcfs/linux/linux-tcpip.h b/libcfs/include/libcfs/linux/linux-tcpip.h
index 45a5563..175911e 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-tcpip.h
+++ b/libcfs/include/libcfs/linux/linux-tcpip.h
@@ -16,8 +16,8 @@
  * 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 [sun.com URL with a
- * copy of GPLv2].
+ * 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
@@ -51,6 +51,21 @@
 
 #include <net/sock.h>
 
+#ifndef HIPQUAD
+// XXX Should just kill all users
+#if defined(__LITTLE_ENDIAN)
+#define HIPQUAD(addr) \
+        ((unsigned char *)&addr)[3], \
+        ((unsigned char *)&addr)[2], \
+        ((unsigned char *)&addr)[1], \
+        ((unsigned char *)&addr)[0]
+#elif defined(__BIG_ENDIAN)
+#define HIPQUAD NIPQUAD
+#else
+#error "Please fix asm/byteorder.h"
+#endif /* __LITTLE_ENDIAN */
+#endif
+
 typedef struct socket   cfs_socket_t;
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,72))
@@ -72,8 +87,25 @@ typedef struct socket   cfs_socket_t;
 #endif
 
 #define SOCK_SNDBUF(so)         ((so)->sk->sk_sndbuf)
-#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)
 
+static inline int
+libcfs_sock_error(struct socket *sock)
+{
+        return sock->sk->sk_err;
+}
+
+static inline int
+libcfs_sock_wmem_queued(struct socket *sock)
+{
+        return sock->sk->sk_wmem_queued;
+}
+
+#ifdef HAVE_INIT_NET
+#define DEFAULT_NET    (&init_net)
+#else
+/* some broken backports */
+#define DEFAULT_NET    (NULL)
+#endif
+
 #endif