X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flinux%2Flinux-tcpip.h;h=2e04b1fe942a7af4e5d430a9d4b131cc518ba78a;hb=8c47378b057e72d6125f4baffe8721e0734d0d3f;hp=175911ebf62ffdb678fa29f5dba83a042f849e7a;hpb=95dbd166988cf0a2912c51305572c78a9aa2d324;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/linux/linux-tcpip.h b/libcfs/include/libcfs/linux/linux-tcpip.h
index 175911e..2e04b1f 100644
--- a/libcfs/include/libcfs/linux/linux-tcpip.h
+++ b/libcfs/include/libcfs/linux/linux-tcpip.h
@@ -1,6 +1,4 @@
-/* -*- 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.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -50,6 +50,7 @@
 #endif
 
 #include <net/sock.h>
+#include <libcfs/linux/portals_compat25.h>
 
 #ifndef HIPQUAD
 // XXX Should just kill all users
@@ -68,25 +69,6 @@
 
 typedef struct socket   cfs_socket_t;
 
-#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_rcvbuf      rcvbuf
-# define sk_socket      socket
-# define sk_sleep       sleep
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
-# define sk_wmem_queued wmem_queued
-# define sk_err         err
-# define sk_route_caps  route_caps
-#endif
-
-#define SOCK_SNDBUF(so)         ((so)->sk->sk_sndbuf)
 #define SOCK_TEST_NOSPACE(so)   test_bit(SOCK_NOSPACE, &(so)->flags)
 
 static inline int
@@ -100,12 +82,4 @@ 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